From patchwork Mon May 7 10:38:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8829 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2712314jad; Mon, 7 May 2018 03:41:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqQElZ5i/niQHJz2AfW1hcUWeJkYWOhuPqM4ZhWOAd5xKsyF1iiUyoPE3asezfXNiwVHIKr X-Received: by 2002:a1c:9583:: with SMTP id x125-v6mr471126wmd.56.1525689665199; Mon, 07 May 2018 03:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525689665; cv=none; d=google.com; s=arc-20160816; b=lH1kJn3m7uIJHOWiDEVYvk72F641brXUg94nIRBbGP/MG2LwmQvI8fwZnRgVxi94FO lJemmZy98sXcXCbPQjMiqiQDC/gDFhlXk9uygenSLtcd3OH+y/rie/BTJy+ms5wKkgxC 6m3gHF9WcOYzPNo7/7VOcEk2LdfLTGeBHXLtpeUPlhV+cDd0qZjVD9ZTc1UKx79EjKYu q1k33a9C0PIid70Ka/fGlmg+GFqL07z5bFa3b0cxmrzKAvbDcGbUhHB/AdVx/as7MGqt Ue3EC7w4wn0xCXTJedcX9tcvwtP7xb7/qQO/VzNTVcnzCapGyT8/cM4TeU2uPZ9i//c7 1htg== 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=YMb4u8ET0a7D9mjPAbBapHWjpjyPYRfJTrK8ue7MTF4=; b=D/y5RJC8kn9D9Whp/OcdHGJZhlmLcPAt8qYtqynmDXVrkYqyoXtO8DEPYN6FZAA1Sx Hz9kDeIvJqAvtufynThmX31TP1qIr/PPYYQVIsZAcYmjB3RwkoVaIs501f0KVGfu2RUP yp3RLI0baqdVGrD4pWtZkt51o4P7X1x6WCOc9DEfqNQjAC/08itHBPXYtjO1LR7q/iyt zoAWGzi8AtDJd0FOGZAmT5DrGFTbtyVe2SYKElKdRZACNUW89YfdT6IQ/tO3HLq7FWKE niWCMqPrYVHdTGBr8JpuTwK1PqPtXeA5zb5n4C3h1eE/ONco4QuxLl3C9oac7BsUBN0T Bn7g== 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 c16si5264831wmc.10.2018.05.07.03.41.04; Mon, 07 May 2018 03:41:05 -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 B265168A637; Mon, 7 May 2018 13:39:26 +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 6FD1368A33E for ; Mon, 7 May 2018 13:39:23 +0300 (EEST) Received: from [172.31.218.46] (helo=vie01a-dmta-pe06-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYj-000793-Uv for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:57 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYd-0007Gu-Oj for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:51 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id jNfh1x0170S5wYM01Nfioo; Mon, 07 May 2018 12:39:43 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 May 2018 12:38:08 +0200 Message-Id: <20180507103817.8320-4-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 04/13] avformat/mxfenc: Add object model version 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 73015816eb..f0fd406493 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -422,6 +422,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x3C0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x02,0x00,0x00,0x00,0x00}}, /* Instance UID */ { 0x3B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x04,0x00,0x00}}, /* Last Modified Date */ { 0x3B05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x05,0x00,0x00,0x00}}, /* Version */ + { 0x3B07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x04,0x00,0x00,0x00}}, /* Object Model Version */ { 0x3B06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x04,0x00,0x00}}, /* Identifications reference */ { 0x3B03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x01,0x00,0x00}}, /* Content Storage reference */ { 0x3B09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x03,0x00,0x00,0x00,0x00}}, /* Operational Pattern UL */ @@ -681,7 +682,7 @@ static void mxf_write_preface(AVFormatContext *s) mxf_write_metadata_key(pb, 0x012f00); PRINT_KEY(s, "preface key", pb->buf_ptr - 16); - klv_encode_ber_length(pb, 130 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count)); + klv_encode_ber_length(pb, 138 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count)); // write preface set uid mxf_write_local_tag(pb, 16, 0x3C0A); @@ -696,6 +697,10 @@ static void mxf_write_preface(AVFormatContext *s) mxf_write_local_tag(pb, 2, 0x3B05); avio_wb16(pb, 259); // v1.2 + // Object Model Version + mxf_write_local_tag(pb, 4, 0x3B07); + avio_wb32(pb, 1); + // write identification_refs mxf_write_local_tag(pb, 16 + 8, 0x3B06); mxf_write_refs_count(pb, 1); diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index e5b9ee293e..0d8f09176f 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,4 +1,4 @@ -da66943da7ede9d7409c78befa3c1b95 *tests/data/fate/copy-trac4914.mxf +2bbcbc55eebf305aec776bce60d09f91 *tests/data/fate/copy-trac4914.mxf 561209 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 a22d058868..b1a8840d7a 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -d35f74e97bb8a3d5cadc1df69d82dcf9 +581d38fa877b2db15615989f335e9eaf diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index 13c7eca627..75ec4368a4 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -6222dfa98933f06afb9992ab6c21486c +0979b614a34f668eb47278448b254000 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index c9a1ce8544..a09c8e1bab 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -707059147bb7569509cf3b697b54d701 *./tests/data/lavf/lavf.mxf +e3f486ec383f9df4e4e7063959c88dd5 *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab -5af94bc17e47190a1e2943a461c836ff *./tests/data/lavf/lavf.mxf +4de1237dea5f8377eed4c8effe037ffb *./tests/data/lavf/lavf.mxf 561209 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48 -523ed9d06ab7a4090f9a29fa7abf7a03 *./tests/data/lavf/lavf.mxf +73dec65269c3f5ebe67e4e7fa6f2f6b7 *./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 2e6e13f1ce..62b96b4ba6 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -07a242f1881f0349e4ed10a4f1584ddb *./tests/data/lavf/lavf.mxf_d10 +ea6d7025d72df9aaf63bdbc2be8c82dc *./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 e192f91fe2..323abc330b 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -8117b64eaee48b9b6f8be964afbed8e0 *./tests/data/lavf/lavf.mxf_dv25 +2f8cb1656178419950a9a3505cae3f5b *./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 4d6b45de90..5e93737904 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -d6e87fb17a89a8a8fff96e0fd9d6fd4a *./tests/data/lavf/lavf.mxf_dvcpro50 +9377a3afbf431442e17c5d891b4e6252 *./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 969e2bc4c5..c5aac167b5 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -fea3ed4c2e5088701154530cb2a57f98 *./tests/data/lavf/lavf.mxf_opatom +ebf818890f92bb9710798a3e2ab571fd *./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 84ac7b23ad..08cb7168dd 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -71735ea72b3bdcfa3455d51bc439aa57 *./tests/data/lavf/lavf.mxf_opatom_audio +b79b636502d47239def6e85ab8cc06b3 *./tests/data/lavf/lavf.mxf_opatom_audio 102457 ./tests/data/lavf/lavf.mxf_opatom_audio ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff