virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

rawdec: add a pixel_format private option.

Browse Source
This commit is contained in:
Anton Khirnov 2011-05-24 09:02:11 +02:00
parent d576bbf3eb
commit 2a85f21868
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/rawdec.c
View File

@ -25,6 +25,7 @@
#include "rawdec.h" #include "rawdec.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
/* raw input */ /* raw input */
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap) int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
@ -70,30 +71,37 @@ int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
case AVMEDIA_TYPE_VIDEO: { case AVMEDIA_TYPE_VIDEO: {
FFRawVideoDemuxerContext *s1 = s->priv_data; FFRawVideoDemuxerContext *s1 = s->priv_data;
int width = 0, height = 0, ret; int width = 0, height = 0, ret;
enum PixelFormat pix_fmt;
if(ap->time_base.num) if(ap->time_base.num)
av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
else else
av_set_pts_info(st, 64, 1, 25); av_set_pts_info(st, 64, 1, 25);
if (s1->video_size) { if (s1->video_size && (ret = av_parse_video_size(&width, &height, s1->video_size)) < 0) {
ret = av_parse_video_size(&width, &height, s1->video_size); av_log(s, AV_LOG_ERROR, "Couldn't parse video size.\n");
av_freep(&s1->video_size); goto fail;
if (ret < 0) { }
av_log(s, AV_LOG_ERROR, "Couldn't parse video size.\n"); if ((pix_fmt = av_get_pix_fmt(s1->pixel_format)) == PIX_FMT_NONE) {
return ret; av_log(s, AV_LOG_ERROR, "No such pixel format: %s.\n", s1->pixel_format);
} ret = AVERROR(EINVAL);
goto fail;
} }
#if FF_API_FORMAT_PARAMETERS #if FF_API_FORMAT_PARAMETERS
if (ap->width > 0) if (ap->width > 0)
width = ap->width; width = ap->width;
if (ap->height > 0) if (ap->height > 0)
height = ap->height; height = ap->height;
if (ap->pix_fmt)
pix_fmt = ap->pix_fmt;
#endif #endif
st->codec->width = width; st->codec->width = width;
st->codec->height = height; st->codec->height = height;
st->codec->pix_fmt = ap->pix_fmt; st->codec->pix_fmt = pix_fmt;
if(st->codec->pix_fmt == PIX_FMT_NONE)
st->codec->pix_fmt= PIX_FMT_YUV420P;
break; break;
fail:
av_freep(&s1->video_size);
av_freep(&s1->pixel_format);
return ret;
} }
default: default:
return -1; return -1;
@ -187,6 +195,7 @@ const AVClass ff_rawaudio_demuxer_class = {
#define DEC AV_OPT_FLAG_DECODING_PARAM #define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption video_options[] = { 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 }, { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
{ NULL }, { NULL },
}; };
#undef OFFSET #undef OFFSET

1
libavformat/rawdec.h
View File

@ -34,6 +34,7 @@ typedef struct RawAudioDemuxerContext {
typedef struct FFRawVideoDemuxerContext { typedef struct FFRawVideoDemuxerContext {
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. */ char *video_size; /**< String describing video size, set by a private option. */
char *pixel_format; /**< Set by a private option. */
} FFRawVideoDemuxerContext; } FFRawVideoDemuxerContext;
extern const AVClass ff_rawaudio_demuxer_class; extern const AVClass ff_rawaudio_demuxer_class;