From patchwork Mon May 7 10:38:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8832 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2712504jad; Mon, 7 May 2018 03:41:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZolWUX/LpCOofP8eN5G/homWLZ++z48yWXPnfznzqqesKnLVljMklyGLL5SESkl9gagVLfH X-Received: by 2002:adf:e210:: with SMTP id j16-v6mr31100944wri.118.1525689683177; Mon, 07 May 2018 03:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525689683; cv=none; d=google.com; s=arc-20160816; b=qCVOhzdIGkt3G34A3RMXGfQ5O2jxmCeTvp0u55N9Av2yLJBdi+81FoMmFlDMpgDbtI TY6+J9PNv0LJdP+NalEQ4I6jdhgOGBY3AXc0cB7tuVgay6MrJGkHcgmyRnZaesh28M6O dR2Pwmjoj/iC5TVVoroCYT09COmjEuJlz1L9zyENrHzsKKFm61gz/za8JY7j5qEdiWbH cKJ8xWl+ZccWpz5rmsfmrLUNMHK6kUy7RfdvaMdsMXm4yvrhyZMfU9OygP1TdhOOGZGV ey3surK8sptbNiPNk1R7/AfQ4Qz0djY/oHbA2gz+N7k/dwX4OHH0rQtgqavKUPaff/BA vkBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=eaibaFqRsyrifsfgQuXO5ev0O4PyN8VJ+HEJ60th1h4=; b=G1aQiQm3StsLVsr6O4Yz/bR4vXmctL0+b9R9YpCWrNQMKG/rKxBaJJcyDxKk0Npon9 gRNE+FcdGLrci+rGg/Hw7RXdtjH/eGngfWU1GDF3QoqpTVVd8hwdkBQwtNBqUSg/GZH5 OT/Jh0ppZUmWpLau60+M9Ay58a54JjWY4gIYG2zP7UCRkpsoV66tqb7wWFLstdHfzfGD iajUv7ta6WnIWwRUaTYFYmtA39bZA+8sl8gYtD+HmR8qCik9JqV/Gxrpad4a8gVgquzX 940/BTA8JQFFCTzZv/HG9AnrulM+fGcajLt7ai9DsyZn4RHYwQcURG45kD26LZswW/vA q28A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k48-v6si8999887wrk.429.2018.05.07.03.41.22; Mon, 07 May 2018 03:41:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0672168A643; Mon, 7 May 2018 13:39:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0AE568A60D for ; Mon, 7 May 2018 13:39:23 +0300 (EEST) Received: from [172.31.218.49] (helo=vie01a-dmta-pe07-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYk-000799-5s for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:58 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYe-0004Yv-7E for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:52 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id jNfq1x02M0S5wYM01Nfrru; Mon, 07 May 2018 12:39:52 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 May 2018 12:38:15 +0200 Message-Id: <20180507103817.8320-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180507103817.8320-1-michael@niedermayer.cc> References: <20180507103817.8320-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 11/13] avformat/mxfenc: Write Audio Ref Level for D10 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/mxfenc.c | 8 ++++++++ tests/ref/fate/copy-trac4914 | 2 +- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/time_base | 2 +- tests/ref/lavf/mxf | 6 +++--- tests/ref/lavf/mxf_d10 | 2 +- tests/ref/lavf/mxf_dv25 | 2 +- tests/ref/lavf/mxf_dvcpro50 | 2 +- tests/ref/lavf/mxf_opatom | 2 +- tests/ref/lavf/mxf_opatom_audio | 2 +- 10 files changed, 19 insertions(+), 11 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index adf5527534..d57f5372c6 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -507,6 +507,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { // Generic Sound Essence Descriptor { 0x3D02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x02,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Locked/Unlocked */ { 0x3D03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x01,0x01,0x01,0x00,0x00}}, /* Audio sampling rate */ + { 0x3D04, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x02,0x01,0x01,0x03,0x00,0x00,0x00}}, /* Audio Ref Level */ { 0x3D07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x01,0x01,0x04,0x00,0x00,0x00}}, /* ChannelCount */ { 0x3D01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x02,0x03,0x03,0x04,0x00,0x00,0x00}}, /* Quantization bits */ { 0x3D06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x02,0x04,0x02,0x00,0x00,0x00,0x00}}, /* Sound Essence Compression */ @@ -1333,6 +1334,8 @@ static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, con if (s->oformat == &ff_mxf_opatom_muxer) duration_size = 12; + if (s->oformat == &ff_mxf_d10_muxer) + size += 5; mxf_write_generic_desc(s, st, key, size+duration_size+5+12+8+8); @@ -1350,6 +1353,11 @@ static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, con avio_wb32(pb, st->codecpar->sample_rate); avio_wb32(pb, 1); + if (s->oformat == &ff_mxf_d10_muxer) { + mxf_write_local_tag(pb, 1, 0x3D04); + avio_w8(pb, 0); + } + mxf_write_local_tag(pb, 4, 0x3D07); if (mxf->channel_count == -1) { if (show_warnings && (s->oformat == &ff_mxf_d10_muxer) && (st->codecpar->channels != 4) && (st->codecpar->channels != 8)) diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index e3266abeb9..8bd8a23eef 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,4 +1,4 @@ -298afac2f4ddfed331294981160023f0 *tests/data/fate/copy-trac4914.mxf +0576133def482f672d56369bc945f9d2 *tests/data/fate/copy-trac4914.mxf 561721 tests/data/fate/copy-trac4914.mxf #tb 0: 1001/30000 #media_type 0: video diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index b9beffef66..8c3469de61 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -471e8a7d012fb2b00835aadd5fe648c7 +a1a1e8df772ef28380ce95f12e7e8cb8 diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index acda7c5fcf..aed683221d 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -68608a7f54b8fe3a85cd387e64bab764 +8149dfa839d55d7f0c127d66ebe86433 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 9f5818e0af..c2bc32bcf6 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -408b3758c11af3210c722a52d2754d8c *./tests/data/lavf/lavf.mxf +0e342e262c9ad13b3d4758e3666f453e *./tests/data/lavf/lavf.mxf 526393 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab -76d3bec8f170e389da50a82075c8bf83 *./tests/data/lavf/lavf.mxf +9d30acfb4cd73cfa6e46a01eea625521 *./tests/data/lavf/lavf.mxf 561721 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48 -caa15603349cb79d11b75a7c6ad633ab *./tests/data/lavf/lavf.mxf +76dfdb299f0ae2ed5094405dcd130d25 *./tests/data/lavf/lavf.mxf 526393 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index e73cd5d24f..fae3f40168 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -eb9412edd406c02e4d2ac2380748186b *./tests/data/lavf/lavf.mxf_d10 +7bad01ac8e0f223477f89a7443708ca8 *./tests/data/lavf/lavf.mxf_d10 5332013 ./tests/data/lavf/lavf.mxf_d10 ./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488 diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 index 8635484f17..c54b556a4d 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -eddb23aba03c1c0499928bca27d43795 *./tests/data/lavf/lavf.mxf_dv25 +10abfd24b120f93b79d3da0f0677c449 *./tests/data/lavf/lavf.mxf_dv25 3834413 ./tests/data/lavf/lavf.mxf_dv25 ./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52 diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50 index 5df967054c..cd581528a1 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -cfbd162ecd9fa35f9f81d0b721f965e3 *./tests/data/lavf/lavf.mxf_dvcpro50 +a1dc7489ca5fa12e58401ef00b511b0d *./tests/data/lavf/lavf.mxf_dvcpro50 7431213 ./tests/data/lavf/lavf.mxf_dvcpro50 ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index 57829f0ebd..1a850133b5 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -062eb7acb97409a91791ca11374a4b5d *./tests/data/lavf/lavf.mxf_opatom +29023fcae1bcdb40982b0db26ec46a62 *./tests/data/lavf/lavf.mxf_opatom 4717625 ./tests/data/lavf/lavf.mxf_opatom ./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio index db90cf2718..b5e0bbe5ed 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -b05d38be5e3e40bfe9a9de775370a7ed *./tests/data/lavf/lavf.mxf_opatom_audio +81103a08d27122534790b33cf90b8125 *./tests/data/lavf/lavf.mxf_opatom_audio 102969 ./tests/data/lavf/lavf.mxf_opatom_audio ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff