From 23494643cf0bb1fa7421fd7cfa7eaa56c876ba64 Mon Sep 17 00:00:00 2001
From: bcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Sat, 4 Jul 2009 07:49:12 +0000
Subject: [PATCH] write profile and level local tag in mpeg descriptor

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19336 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---
 libavformat/mxfenc.c      | 10 +++++++++-
 tests/lavf.regression.ref |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 2a76c1f1d..45c2ff629 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -298,6 +298,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
     { 0x3F0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x04,0x04,0x02,0x05,0x00,0x00,0x00}}, /* Index Entry Array */
     // MPEG video Descriptor
     { 0x8000, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0B,0x00,0x00}}, /* BitRate */
+    { 0x8007, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0A,0x00,0x00}}, /* ProfileAndLevel */
     // Wave Audio Essence Descriptor
     { 0x3D09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x03,0x05,0x00,0x00,0x00}}, /* Average Bytes Per Second */
     { 0x3D0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x02,0x01,0x00,0x00,0x00}}, /* Block Align */
@@ -855,12 +856,19 @@ static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st)
 static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
 {
     ByteIOContext *pb = s->pb;
+    int profile_and_level = (st->codec->profile<<4) | st->codec->level;
 
-    mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 8);
+    mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 8+5);
 
     // bit rate
     mxf_write_local_tag(pb, 4, 0x8000);
     put_be32(pb, st->codec->bit_rate);
+
+    // profile and level
+    mxf_write_local_tag(pb, 1, 0x8007);
+    if (!st->codec->profile)
+        profile_and_level |= 0x80; // escape bit
+    put_byte(pb, profile_and_level);
 }
 
 static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
diff --git a/tests/lavf.regression.ref b/tests/lavf.regression.ref
index 29dea3a83..04121aceb 100644
--- a/tests/lavf.regression.ref
+++ b/tests/lavf.regression.ref
@@ -9,10 +9,10 @@ bc5e914594523f7c48f9e044c9a9c0b6 *./tests/data/b-lavf.avi
 bfdec98337e6a9d89dc648d1e65a41db *./tests/data/b-lavf.mpg
 378880 ./tests/data/b-lavf.mpg
 ./tests/data/b-lavf.mpg CRC=0xaf760568
-36ea24816444a40fa47b866a409a79b0 *./tests/data/b-lavf.mxf
+4c2cd0f62014a7c6571d8dbdf4248965 *./tests/data/b-lavf.mxf
 535097 ./tests/data/b-lavf.mxf
 ./tests/data/b-lavf.mxf CRC=0xd7ff387d
-0a7cc51de3da754ce36dffeeda290c45 *./tests/data/b-lavf.mxf_d10
+4463959da5ebd7536a579a628c4f6412 *./tests/data/b-lavf.mxf_d10
 5330989 ./tests/data/b-lavf.mxf_d10
 ./tests/data/b-lavf.mxf_d10 CRC=0xd241c8b6
 2e9bd99fbb121ae4887109e3a4169acd *./tests/data/b-lavf.ts
-- 
2.11.4.GIT