From patchwork Mon May 7 10:38:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8833 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2712399jad; Mon, 7 May 2018 03:41:14 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq5hiJu8O44vEp75RWeqYjHusKre8OZ1Q0ELrZeojLn20ukoA7ooME77K1h9oDxV3QJ1YWt X-Received: by 10.28.203.136 with SMTP id b130mr479688wmg.78.1525689674001; Mon, 07 May 2018 03:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525689673; cv=none; d=google.com; s=arc-20160816; b=kOhGSI89DQ7fZWyImYZ9/V8wfkcuMpM7A1Qx3ESw3Thbir9Wrvrc/Kwf2hxtb+bOlo IBKrXQslPE0zJ0wIF0mJlCizVksfq5BwWzzwUUHPWdaycYr+Iz2qyF+LYxnHvokxkL+f V4hXkP4h9Uncq2en7BbVgVRi4dtsvBxutxMVSnlhIIKMjzuw4G2xqdeBlYLZa+3lRWUy ca7D5Ibmz6xBZT+rm4xhCOYdSZVM9gzzq0hYMgH9tXf9nYoW6yNM0UDQyNDjdVW6UQRA +BzVn5saZViZoUwxEFc6Z1PkP2gzwuDb55c2ZUAtHUgwkDGX9+ltQO3QtkGeUwCWzc4z PjPA== 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=Jgn2SFqyBRvUhztOB665yw3FJ8xoq5734eSCRlxm6rY=; b=WXi9Ul7WWP0nLl35rJ5CV0cJnvS8kPqisgeqV8x9Vgz1bIeWRqaQwEAyb6xzdDU7fV Z9JesKLxESCUiDzUqbrf4lbF/0HM53m4vOkoVTk18DA8jFOBJqHgk0LVm4Gb7aKp4eAh eROq5f0ShVLVSgNeOSbL27JVCsn+w/coKopmr2w/bOnjDibmAB2GnRFTrHbJIze3zdj6 n4VcDvL84GGqJk6rIzQTqTOVJ4lgSdfhgKqOxFqje59ZhVATiTP8Jr4rMh/DkU842Pp7 9wfK2C5s5WizLWqtkUnP3LnGTnpVuXA29FItLC8a85go/vilq/We1MWCKcNJX6tDFTKr BheA== 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 y82si4643253wmd.82.2018.05.07.03.41.13; Mon, 07 May 2018 03:41:13 -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 6C90F68A63A; Mon, 7 May 2018 13:39:27 +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 9643068A606 for ; Mon, 7 May 2018 13:39:23 +0300 (EEST) Received: from [172.31.218.52] (helo=vie01a-dmta-pe08-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYk-000796-4W 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-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYe-0001Bx-IL 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 jNfo1x01C0S5wYM01NfprF; Mon, 07 May 2018 12:39:49 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 May 2018 12:38:13 +0200 Message-Id: <20180507103817.8320-9-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 09/13] avformat/mxfenc: Add Padding Bits 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 | 7 ++++++- 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, 17 insertions(+), 12 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 722830615e..f2be76cc86 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -500,6 +500,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x3302, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x05,0x00,0x00,0x00}}, /* Horizontal Subsampling */ { 0x3308, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x01,0x10,0x00,0x00,0x00}}, /* Vertical Subsampling */ { 0x3303, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x06,0x00,0x00,0x00}}, /* Color Siting */ + { 0x3307, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x04,0x00,0x00,0x00,0x00}}, /* Padding Bits */ { 0x3304, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x03,0x03,0x00,0x00,0x00}}, /* Black Ref level */ { 0x3305, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x03,0x04,0x00,0x00,0x00}}, /* White Ref level */ { 0x3306, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x03,0x05,0x00,0x00,0x00}}, /* Color Range */ @@ -1147,7 +1148,7 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke int stored_height = (st->codecpar->height+15)/16*16; int display_height; int f1, f2; - unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5 + 5*8; + unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5 + 5*8 + 6; if (sc->interlaced && sc->field_dominance) desc_size += 5; if (sc->signal_standard) @@ -1228,6 +1229,10 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke mxf_write_local_tag(pb, 1, 0x3303); avio_w8(pb, sc->color_siting); + // Padding Bits + mxf_write_local_tag(pb, 2, 0x3307); + avio_wb16(pb, 0); + if (st->codecpar->color_range != AVCOL_RANGE_UNSPECIFIED) { int black = 0, white = (1<component_depth) - 1, diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index f868753d45..e3266abeb9 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,4 +1,4 @@ -2296e01ba6794ab91c78d8bc1215a801 *tests/data/fate/copy-trac4914.mxf +298afac2f4ddfed331294981160023f0 *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 50023ce52a..b9beffef66 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -c5752bf1b72694455e1b348cad8660c5 +471e8a7d012fb2b00835aadd5fe648c7 diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index 979aa08972..acda7c5fcf 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -6aac6c1a2e367e43d665bdb974bb7679 +68608a7f54b8fe3a85cd387e64bab764 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index df1c2607c7..9f5818e0af 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -b2c881236ca2791a6f378545d82a891b *./tests/data/lavf/lavf.mxf +408b3758c11af3210c722a52d2754d8c *./tests/data/lavf/lavf.mxf 526393 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab -b14305ee249cc9a7f1708737dbd6daa7 *./tests/data/lavf/lavf.mxf +76d3bec8f170e389da50a82075c8bf83 *./tests/data/lavf/lavf.mxf 561721 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48 -0c8ddc85308c8e00d588c33f2458d4be *./tests/data/lavf/lavf.mxf +caa15603349cb79d11b75a7c6ad633ab *./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 3f91f9c30e..e73cd5d24f 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -e167b53d927a43d6b14c5d0631640adb *./tests/data/lavf/lavf.mxf_d10 +eb9412edd406c02e4d2ac2380748186b *./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 992f0a927d..8635484f17 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -7ff3cc1ee0a68cc08221c28a1b801490 *./tests/data/lavf/lavf.mxf_dv25 +eddb23aba03c1c0499928bca27d43795 *./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 74b0bd17de..5df967054c 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -b6b24c4c562e2d4c866a3f53907c8745 *./tests/data/lavf/lavf.mxf_dvcpro50 +cfbd162ecd9fa35f9f81d0b721f965e3 *./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 c72481b193..57829f0ebd 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -6cf21f1d5e2406c50edf9c34ecdf2b45 *./tests/data/lavf/lavf.mxf_opatom +062eb7acb97409a91791ca11374a4b5d *./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 f020530cc7..db90cf2718 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -0778fda8cea977d37674868ad8ddc2fd *./tests/data/lavf/lavf.mxf_opatom_audio +b05d38be5e3e40bfe9a9de775370a7ed *./tests/data/lavf/lavf.mxf_opatom_audio 102969 ./tests/data/lavf/lavf.mxf_opatom_audio ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff