From patchwork Mon May 7 10:38:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8834 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2718155jad; Mon, 7 May 2018 03:49:01 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoODPK0Sd6LGiOJdpLuMLun24mr9suetY/9lZ0A5euPzzDfNOzO4pH7HqmOan58TouXaCaG X-Received: by 2002:a1c:a750:: with SMTP id q77-v6mr439184wme.111.1525690141653; Mon, 07 May 2018 03:49:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525690141; cv=none; d=google.com; s=arc-20160816; b=OHi6jj1rlLMfTD3vzsCm1bhTRkFzWoWSBMssX5YGZ4U1ii75IBeAS0jArosZqp3vd1 TBaTS/18tDfq875dg3nkl9a+DYQxFysKPaRSdWF59YX9l//TtwdKDI6NG/8nhvQI5Che TLRm7sS9aplNuphB7bIvz56P1li8GRk+CT81x+bNZXlliPBv2wCgRG/jTRRuTyrZ2Btm t59eBnwKEl3Bz3s0evxWLtGIxOgYBMAOUxIRld5NJuzS16A2fGB/b6KsC5dzc5b6V/KI spudxVMeoVaqk+1XQ3jagZyDZPwZKopJ3UeqmwKTPH8/rnn6OsfW1xO7+QcSEh4Blfes 6tNg== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=U4wnqY5WajAelVzfkUnW+ZB52A4Ne7rxgI4n5c55pZI=; b=YfNSx+ULeVZazqQUvrJDo7x3AAgcCzoGrGP/GrpQn2yUjQIBhJdDm7vMvwJdFW0iwT r9ldk8gn7ZGrD2rSIOpFz0Oyv08SFuY52eBrX0lR8eWSvIkHerh6RS9kmYxg2UXijAlf dOWyV4AThI2TZgAc+ye2PUQmynTvdXGiQ+zDq98THVxfrSMO2MCNvIRxByA7ubtuX6gz ZipqbQHwHRdhX2wYWMsK5hYjXQCvIiJiTdy7OhOlPwsq3TAw83QwtRV4mAhPtEzEyJBs g4cpVkwgGl6giSKkGkwiqg6WntB1hPV4dhFowD5J7xkvrx47kGSaQwHRT3cBvIY2hxAP s3IA== 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 g14-v6si18127814wrm.101.2018.05.07.03.49.01; Mon, 07 May 2018 03:49:01 -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 1B4EF68A50D; Mon, 7 May 2018 13:48:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9447E68A3BD for ; Mon, 7 May 2018 13:48:18 +0300 (EEST) 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 1fFdhN-00029x-29 for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:48:53 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id jNfc1x00i0S5wYM01Nfdn1; Mon, 07 May 2018 12:39:38 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 May 2018 12:38:05 +0200 Message-Id: <20180507103817.8320-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 01/13] avformat/mxfenc: Correct KAG alignment of preface 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 | 1 + tests/ref/fate/copy-trac4914 | 4 ++-- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/time_base | 2 +- tests/ref/lavf/mxf | 12 ++++++------ tests/ref/lavf/mxf_d10 | 4 ++-- tests/ref/lavf/mxf_dv25 | 4 ++-- tests/ref/lavf/mxf_dvcpro50 | 4 ++-- tests/ref/lavf/mxf_opatom | 2 +- tests/ref/lavf/mxf_opatom_audio | 4 ++-- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 3bb70326fe..c0db10b3c2 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1757,6 +1757,7 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid, mxf_write_klv_fill(s); start = avio_tell(s->pb); mxf_write_primer_pack(s); + mxf_write_klv_fill(s); mxf_write_header_metadata_sets(s); pos = avio_tell(s->pb); header_byte_count = pos - start + klv_fill_size(pos); diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index a8f287fafa..06eac9e621 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,5 +1,5 @@ -05fdc4a6e28abb2c26e96224682d2684 *tests/data/fate/copy-trac4914.mxf -560697 tests/data/fate/copy-trac4914.mxf +9097dd426106c40288262b53cc6fdb83 *tests/data/fate/copy-trac4914.mxf +561209 tests/data/fate/copy-trac4914.mxf #tb 0: 1001/30000 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index fb9586097a..7350d2c0bf 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -dda6c54b642b8794a87d809fdb361f95 +625c69eb3801368737266128efdd0a8c diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index 4dd14084d3..75ec4368a4 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -f97551f884df5ab709c5869c66c7b9bc +0979b614a34f668eb47278448b254000 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 7318447ecb..1aff1a0509 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -d4140129463dec64bdb4a7d7ad1b0c82 *./tests/data/lavf/lavf.mxf -525369 ./tests/data/lavf/lavf.mxf +47c67e4309c680ce91df5396541ee31e *./tests/data/lavf/lavf.mxf +525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab -a27bb8cd5e185ea13b0a8daa4eb221cd *./tests/data/lavf/lavf.mxf -560697 ./tests/data/lavf/lavf.mxf +8e5f8bc13d7c888f4b6320f9869d49d5 *./tests/data/lavf/lavf.mxf +561209 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48 -395bf0047c97ceca96935357166b94c7 *./tests/data/lavf/lavf.mxf -525369 ./tests/data/lavf/lavf.mxf +c49f8d4743c8dcc33fa01e6dcb995a38 *./tests/data/lavf/lavf.mxf +525881 ./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 2384d427b0..3af1d7e2d7 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -f4694941b0cd5b5e3c91064d84dbd345 *./tests/data/lavf/lavf.mxf_d10 -5330989 ./tests/data/lavf/lavf.mxf_d10 +3c256050ae20973760dd4e72d854d0dc *./tests/data/lavf/lavf.mxf_d10 +5331501 ./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 e836b14240..9d95083393 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -1ca8143bf6cf322fd39f6e856959d502 *./tests/data/lavf/lavf.mxf_dv25 -3833389 ./tests/data/lavf/lavf.mxf_dv25 +aed946d56c81da2f01974b3805d56f87 *./tests/data/lavf/lavf.mxf_dv25 +3833901 ./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 bb3d6b928a..2965be97c3 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -987fd4b2abb36433fba0e35f4092efc6 *./tests/data/lavf/lavf.mxf_dvcpro50 -7430189 ./tests/data/lavf/lavf.mxf_dvcpro50 +e9cecd6f83c7bff8c41195ce23b3d0b2 *./tests/data/lavf/lavf.mxf_dvcpro50 +7430701 ./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 1cc612e627..6369e91198 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -b8fe60f7457b83709f33357d04c8db0c *./tests/data/lavf/lavf.mxf_opatom +e8f8bce1c9c92c678f0e9b3350984282 *./tests/data/lavf/lavf.mxf_opatom 4717113 ./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 deed55e526..57c957853a 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -e7da52bd591e6eddb4e1af381a4e5bd4 *./tests/data/lavf/lavf.mxf_opatom_audio -101945 ./tests/data/lavf/lavf.mxf_opatom_audio +2fc8da147ec62c5ba98598bbb2737515 *./tests/data/lavf/lavf.mxf_opatom_audio +102457 ./tests/data/lavf/lavf.mxf_opatom_audio ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff