Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/21/head
Paul B Mahol 12 years ago
parent 9f5bb44021
commit d343848de2
1 changed files with 5 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      libavformat/rawvideodec.c

17
libavformat/rawvideodec.c
Unescape View File

@ -27,7 +27,7 @@
typedef struct RawVideoDemuxerContext { typedef struct RawVideoDemuxerContext {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
char *video_size; /**< String describing video size, set by a private option. */ int width, height; /**< Integers describing video size, set by a private option. */
char *pixel_format; /**< Set by a private option. */ char *pixel_format; /**< Set by a private option. */
AVRational framerate; /**< AVRational describing framerate, set by a private option. */ AVRational framerate; /**< AVRational describing framerate, set by a private option. */
} RawVideoDemuxerContext; } RawVideoDemuxerContext;
@ -36,7 +36,6 @@ typedef struct RawVideoDemuxerContext {
static int rawvideo_read_header(AVFormatContext *ctx) static int rawvideo_read_header(AVFormatContext *ctx)
{ {
RawVideoDemuxerContext *s = ctx->priv_data; RawVideoDemuxerContext *s = ctx->priv_data;
int width = 0, height = 0, ret = 0;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
AVStream *st; AVStream *st;
@ -48,12 +47,6 @@ static int rawvideo_read_header(AVFormatContext *ctx)
st->codec->codec_id = ctx->iformat->raw_codec_id; st->codec->codec_id = ctx->iformat->raw_codec_id;
if (s->video_size &&
(ret = av_parse_video_size(&width, &height, s->video_size)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Couldn't parse video size.\n");
return ret;
}
if ((pix_fmt = av_get_pix_fmt(s->pixel_format)) == AV_PIX_FMT_NONE) { if ((pix_fmt = av_get_pix_fmt(s->pixel_format)) == AV_PIX_FMT_NONE) {
av_log(ctx, AV_LOG_ERROR, "No such pixel format: %s.\n", av_log(ctx, AV_LOG_ERROR, "No such pixel format: %s.\n",
s->pixel_format); s->pixel_format);
@ -62,10 +55,10 @@ static int rawvideo_read_header(AVFormatContext *ctx)
avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num);
st->codec->width = width; st->codec->width = s->width;
st->codec->height = height; st->codec->height = s->height;
st->codec->pix_fmt = pix_fmt; st->codec->pix_fmt = pix_fmt;
st->codec->bit_rate = av_rescale_q(avpicture_get_size(st->codec->pix_fmt, width, height), st->codec->bit_rate = av_rescale_q(avpicture_get_size(st->codec->pix_fmt, s->width, s->height),
(AVRational){8,1}, st->time_base); (AVRational){8,1}, st->time_base);
return 0; return 0;
@ -96,7 +89,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
#define OFFSET(x) offsetof(RawVideoDemuxerContext, x) #define OFFSET(x) offsetof(RawVideoDemuxerContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM #define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption rawvideo_options[] = { static const AVOption rawvideo_options[] = {
{ "video_size", "set frame size", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC },
{ "pixel_format", "set pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC }, { "pixel_format", "set pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
{ "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC }, { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC },
{ NULL }, { NULL },

Write Preview
Loading…
Cancel
Save