diff options
| author | David Conrad <lessen42@gmail.com> | 2009-05-11 04:35:15 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2009-05-11 04:35:15 +0000 |
| commit | 56bb72dc3b60abf6087403d953077060301342f9 (patch) | |
| tree | ea1985544803bfaa90457010f964f43857535a4a /libavformat/yuv4mpeg.c | |
| parent | 580a7465fb416782a1d5ad95011351b9c257f0de (diff) | |
Use chroma_sample_location in reading/writing yuv4mpeg
Originally committed as revision 18796 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/yuv4mpeg.c')
| -rw-r--r-- | libavformat/yuv4mpeg.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 3fd7927884..8e7acebe71 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -62,7 +62,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) colorspace = " C411 XYSCSS=411"; break; case PIX_FMT_YUV420P: - colorspace = (st->codec->codec_id == CODEC_ID_DVVIDEO)?" C420paldv XYSCSS=420PALDV":" C420mpeg2 XYSCSS=420MPEG2"; + colorspace = (st->codec->chroma_sample_location == AVCHROMA_LOC_TOPLEFT)?" C420paldv XYSCSS=420PALDV": + (st->codec->chroma_sample_location == AVCHROMA_LOC_LEFT) ?" C420mpeg2 XYSCSS=420MPEG2": + " C420jpeg XYSCSS=420JPEG"; break; case PIX_FMT_YUV422P: colorspace = " C422 XYSCSS=422"; @@ -193,6 +195,7 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) ByteIOContext *pb = s->pb; int width=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0; enum PixelFormat pix_fmt=PIX_FMT_NONE,alt_pix_fmt=PIX_FMT_NONE; + enum AVChromaLocation chroma_sample_location = AVCHROMA_LOC_UNSPECIFIED; AVStream *st; struct frame_attributes *s1 = s->priv_data; @@ -222,13 +225,16 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) tokstart=tokend; break; case 'C': // Color space - if (strncmp("420jpeg",tokstart,7)==0) + if (strncmp("420jpeg",tokstart,7)==0) { pix_fmt = PIX_FMT_YUV420P; - else if (strncmp("420mpeg2",tokstart,8)==0) + chroma_sample_location = AVCHROMA_LOC_CENTER; + } else if (strncmp("420mpeg2",tokstart,8)==0) { pix_fmt = PIX_FMT_YUV420P; - else if (strncmp("420paldv", tokstart, 8)==0) + chroma_sample_location = AVCHROMA_LOC_LEFT; + } else if (strncmp("420paldv", tokstart, 8)==0) { pix_fmt = PIX_FMT_YUV420P; - else if (strncmp("411", tokstart, 3)==0) + chroma_sample_location = AVCHROMA_LOC_TOPLEFT; + } else if (strncmp("411", tokstart, 3)==0) pix_fmt = PIX_FMT_YUV411P; else if (strncmp("422", tokstart, 3)==0) pix_fmt = PIX_FMT_YUV422P; @@ -332,6 +338,7 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO; st->sample_aspect_ratio= (AVRational){aspectn, aspectd}; + st->codec->chroma_sample_location = chroma_sample_location; return 0; } |