mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
rawdec: add video_size private option.
This commit is contained in:
parent
724a900c45
commit
973f686a6c
@ -24,6 +24,7 @@
|
||||
#include "avio_internal.h"
|
||||
#include "rawdec.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
|
||||
/* raw input */
|
||||
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||
@ -66,17 +67,34 @@ int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
|
||||
break;
|
||||
}
|
||||
case AVMEDIA_TYPE_VIDEO:
|
||||
case AVMEDIA_TYPE_VIDEO: {
|
||||
FFRawVideoDemuxerContext *s1 = s->priv_data;
|
||||
int width = 0, height = 0, ret;
|
||||
if(ap->time_base.num)
|
||||
av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
|
||||
else
|
||||
av_set_pts_info(st, 64, 1, 25);
|
||||
st->codec->width = ap->width;
|
||||
st->codec->height = ap->height;
|
||||
if (s1->video_size) {
|
||||
ret = av_parse_video_size(&width, &height, s1->video_size);
|
||||
av_freep(&s1->video_size);
|
||||
if (ret < 0) {
|
||||
av_log(s, AV_LOG_ERROR, "Couldn't parse video size.\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
#if FF_API_FORMAT_PARAMETERS
|
||||
if (ap->width > 0)
|
||||
width = ap->width;
|
||||
if (ap->height > 0)
|
||||
height = ap->height;
|
||||
#endif
|
||||
st->codec->width = width;
|
||||
st->codec->height = height;
|
||||
st->codec->pix_fmt = ap->pix_fmt;
|
||||
if(st->codec->pix_fmt == PIX_FMT_NONE)
|
||||
st->codec->pix_fmt= PIX_FMT_YUV420P;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
@ -165,6 +183,22 @@ const AVClass ff_rawaudio_demuxer_class = {
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
};
|
||||
|
||||
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
|
||||
#define DEC AV_OPT_FLAG_DECODING_PARAM
|
||||
static const AVOption video_options[] = {
|
||||
{ "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
|
||||
{ NULL },
|
||||
};
|
||||
#undef OFFSET
|
||||
#undef DEC
|
||||
|
||||
const AVClass ff_rawvideo_demuxer_class = {
|
||||
.class_name = "rawvideo demuxer",
|
||||
.item_name = av_default_item_name,
|
||||
.option = video_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
};
|
||||
|
||||
#if CONFIG_G722_DEMUXER
|
||||
AVInputFormat ff_g722_demuxer = {
|
||||
"g722",
|
||||
|
@ -31,7 +31,13 @@ typedef struct RawAudioDemuxerContext {
|
||||
int channels;
|
||||
} RawAudioDemuxerContext;
|
||||
|
||||
typedef struct FFRawVideoDemuxerContext {
|
||||
const AVClass *class; /**< Class for private options. */
|
||||
char *video_size; /**< String describing video size, set by a private option. */
|
||||
} FFRawVideoDemuxerContext;
|
||||
|
||||
extern const AVClass ff_rawaudio_demuxer_class;
|
||||
extern const AVClass ff_rawvideo_demuxer_class;
|
||||
|
||||
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap);
|
||||
|
||||
|
@ -47,11 +47,12 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
AVInputFormat ff_rawvideo_demuxer = {
|
||||
"rawvideo",
|
||||
NULL_IF_CONFIG_SMALL("raw video format"),
|
||||
0,
|
||||
sizeof(FFRawVideoDemuxerContext),
|
||||
NULL,
|
||||
ff_raw_read_header,
|
||||
rawvideo_read_packet,
|
||||
.flags= AVFMT_GENERIC_INDEX,
|
||||
.extensions = "yuv,cif,qcif,rgb",
|
||||
.value = CODEC_ID_RAWVIDEO,
|
||||
.priv_class = &ff_rawvideo_demuxer_class,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user