diff options
| author | Philip de Nier <philipn@rd.bbc.co.uk> | 2012-02-28 14:16:39 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-07-10 13:51:04 +0200 |
| commit | fda891e108f53b1dd2d9801232c2893e45c072a1 (patch) | |
| tree | 06d69f54eba16431ee67c574d19408eb11209c87 /libavformat/mxf.c | |
| parent | dfefede00e3ea03f2a1bdfcb1b6db11699229049 (diff) | |
| download | ffmpeg-fda891e108f53b1dd2d9801232c2893e45c072a1.tar.gz | |
mxfdec: set pixel format for cdci picture formats
The properties of the CDCI Descriptor are insufficient to specify
the pixel format for uncompressed picture data. SMPTE 377-1 and
RP224v10 have defined a set of picture coding labels to indicate what
formatting was used.
This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats.
It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files
that were created before the coding labels were introduced ~2008
The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to
-1 (PIX_FMT_NONE)
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.c')
| -rw-r--r-- | libavformat/mxf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index e4d9fbd542..77f0b58113 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -55,6 +55,12 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, }; +const MXFCodecUL ff_mxf_pixel_format_uls[] = { + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x01 }, 16, PIX_FMT_UYVY422 }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x02 }, 16, PIX_FMT_YUYV422 }, + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, PIX_FMT_NONE }, +}; + static const struct { enum PixelFormat pix_fmt; const char data[16]; |