[FFmpeg-devel] [PATCH] Fix decoding of DNxHD video in MXF container

[Baptiste Coudurier]

On 02/07/2012 06:55 AM, Joseph Artsimovich wrote:
> On 07/02/2012 14:47, Joseph Artsimovich wrote:
>> Updated versions of my patches are attached.
>> The old DNxHD signature is retained and MXFFrameLayout enum was introduced.
> Sent the wrong version that wouldn't build.  Correct version attached.
> 
> 
> 0001-Fix-frame-height-vs-field-height-confusion-in-MXF-de.patch

LGTM

> From b3f3ef7ecfc03fb6c501173b50115334f422f81e Mon Sep 17 00:00:00 2001
> From: Joseph Artsimovich <joseph at mirriad.com>
> Date: Tue, 7 Feb 2012 10:48:43 +0000
> Subject: [PATCH 1/2] Fix frame height vs field height confusion in MXF
>  decoding.
> 
> 
> 0002-Add-correct-essence-signature-for-VC-3-DNxHD.patch
> 
> 
> From 4c8c3ec9f0c2c8a627b05e9d76c9031933c41140 Mon Sep 17 00:00:00 2001
> From: Joseph Artsimovich <joseph at mirriad.com>
> Date: Tue, 7 Feb 2012 10:49:49 +0000
> Subject: [PATCH 2/2] Add correct essence signature for VC-3/DNxHD.
> 
> The old (probably incorrect) one is still there just in case.
> ---
>  libavformat/mxf.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/libavformat/mxf.c b/libavformat/mxf.c
> index b39a9b6..191d93b 100644
> --- a/libavformat/mxf.c
> +++ b/libavformat/mxf.c
> @@ -41,7 +41,8 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
>      { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13,    CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */
>      { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14,   CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */
>      { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13,   CODEC_ID_RAWVIDEO }, /* Uncompressed */
> -    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14,      CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
> +    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14,      CODEC_ID_DNXHD }, /* ??? possibly wrong */
> +    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 }, 13,      CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
>      { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14,       CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */
>      { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x00 }, 15,       CODEC_ID_V210 }, /* V210 */
>      /* SoundEssenceCompression */

I think it's fine to remove the old one

-- 
Baptiste COUDURIER
Key fingerprint          8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer                           http://www.ffmpeg.org