From patchwork Mon May 7 10:38:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8828 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2712210jad; Mon, 7 May 2018 03:40:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqla5NcyN1it5kE4IQ4JvqZxiJeXw491fCpDXflJfgb5MniP/JzXGX2N1NcgkOrakjVnG4h X-Received: by 10.28.27.77 with SMTP id b74mr416943wmb.71.1525689656112; Mon, 07 May 2018 03:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525689656; cv=none; d=google.com; s=arc-20160816; b=DN7gwbY09Reaht4fZcKSfMcpQVSi4Zf7cxY3Z0ut60Rn5CI/wJo3TCQBox0l9OKYQF uPgNoml65vIFZEGyegElkVaZwhRauU/HwzFpbEtbNoRpVeuwIclWGr9264mOrFyur0Qw gZzyg+DqPdQsweQJDxXj69l2VoPyV5Z7+JfuIS3m10Xu0BK78rNMbpKESvfPaGq7kdJu /GLbV89u7gG1rgokE3oRoborVj2j66AxGD3Vrf4mvYD+4/qat4xf5gl1J8I224xgDo+W SvngTFAzKISygZyShiYI4c+3beZhLJqWxkNlhM+GRKIcwGDhemx1+3AQ93isILnwltxN mFjg== 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=byE0S6T+smbbDpQcHY67j8MzfuDGpMtsknKXClJOiuM=; b=x1zt1A1fBkbzkQsOivEiM4JPKbZQE0t9xAhO8aeXd6mqoRVF9HEwTYPbpkgev6ijpt 7/VT9rpac3xcFt52yeGc1ILR2DxF17FZ/5gAMxs7ehMeHDbafNSkdmibozG8e4oB5uFn Y7Ed8WCxH68Ff4uqPJ9CJ2muWgspkWEyeNsNG/LBNZbwzVanidxeWKliiblSWSUhrpBF Z57VybEwpnQgMZE7mrWX3531o0PvnT+vn93bRHtJIoEtZrMTAxWZuy448nhORmKEnyf/ c9IOOF7UaNnItial9x9D40FTXnF9aNoRKDJngF1SzKqniJy+4aUAn/I2D7TL6UdBrF04 Tybw== 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 b13-v6si20551451wra.81.2018.05.07.03.40.55; Mon, 07 May 2018 03:40:56 -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 354B868A62C; Mon, 7 May 2018 13:39:25 +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 9710068A5F1 for ; Mon, 7 May 2018 13:39:17 +0300 (EEST) Received: from [172.31.218.44] (helo=vie01a-dmta-pe05-2.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYd-000788-UY for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:51 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYY-00040J-82 for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:46 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id jNfl1x00D0S5wYM01Nfmq6; Mon, 07 May 2018 12:39:46 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 May 2018 12:38:10 +0200 Message-Id: <20180507103817.8320-6-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 06/13] avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset 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 | 39 +++++++++++++++++++++++++++++++-- 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 | 4 ++-- tests/ref/lavf/mxf_opatom_audio | 4 ++-- 10 files changed, 57 insertions(+), 22 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 9140302b81..e79e1ec7e6 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -480,9 +480,16 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x320D, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x03,0x02,0x05,0x00,0x00,0x00}}, /* Video Line Map */ { 0x3203, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x02,0x00,0x00,0x00}}, /* Stored Width */ { 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* Stored Height */ + { 0x3216, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x03,0x02,0x08,0x00,0x00,0x00}}, /* Stored F2 Offset */ + { 0x3205, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x08,0x00,0x00,0x00}}, /* Sampled Width */ + { 0x3204, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x07,0x00,0x00,0x00}}, /* Sampled Height */ + { 0x3206, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x09,0x00,0x00,0x00}}, /* Sampled X Offset */ + { 0x3207, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0A,0x00,0x00,0x00}}, /* Sampled Y Offset */ { 0x3209, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0C,0x00,0x00,0x00}}, /* Display Width */ { 0x3208, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0B,0x00,0x00,0x00}}, /* Display Height */ + { 0x320A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0D,0x00,0x00,0x00}}, /* Display X offset */ { 0x320B, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0E,0x00,0x00,0x00}}, /* Presentation Y offset */ + { 0x3217, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x03,0x02,0x07,0x00,0x00,0x00}}, /* Display F2 offset */ { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */ { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */ { 0x3212, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x03,0x01,0x06,0x00,0x00,0x00}}, /* Field Dominance (Opt) */ @@ -1135,11 +1142,13 @@ 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; + unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5 + 5*8; if (sc->interlaced && sc->field_dominance) desc_size += 5; if (sc->signal_standard) desc_size += 5; + if (sc->interlaced) + desc_size += 8; mxf_write_generic_desc(s, st, key, desc_size); @@ -1149,6 +1158,22 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke mxf_write_local_tag(pb, 4, 0x3202); avio_wb32(pb, stored_height>>sc->interlaced); + //Sampled width + mxf_write_local_tag(pb, 4, 0x3205); + avio_wb32(pb, st->codecpar->width); + + //Samples height + mxf_write_local_tag(pb, 4, 0x3204); + avio_wb32(pb, st->codecpar->height>>sc->interlaced); + + //Sampled X Offset + mxf_write_local_tag(pb, 4, 0x3206); + avio_wb32(pb, 0); + + //Sampled Y Offset + mxf_write_local_tag(pb, 4, 0x3207); + avio_wb32(pb, 0); + mxf_write_local_tag(pb, 4, 0x3209); avio_wb32(pb, st->codecpar->width); @@ -1162,10 +1187,20 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke mxf_write_local_tag(pb, 4, 0x3208); avio_wb32(pb, display_height>>sc->interlaced); - // presentation Y offset + // display X offset + mxf_write_local_tag(pb, 4, 0x320A); + avio_wb32(pb, 0); + + // display Y offset mxf_write_local_tag(pb, 4, 0x320B); avio_wb32(pb, (st->codecpar->height - display_height)>>sc->interlaced); + if (sc->interlaced) { + //Display F2 Offset + mxf_write_local_tag(pb, 4, 0x3217); + avio_wb32(pb, -((st->codecpar->height - display_height)&1)); + } + // component depth mxf_write_local_tag(pb, 4, 0x3301); avio_wb32(pb, sc->component_depth); diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index 0d8f09176f..8f060eec38 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,5 +1,5 @@ -2bbcbc55eebf305aec776bce60d09f91 *tests/data/fate/copy-trac4914.mxf -561209 tests/data/fate/copy-trac4914.mxf +07932de23a28c175e259a8eb1cbfa052 *tests/data/fate/copy-trac4914.mxf +561721 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 b1a8840d7a..7d64903b72 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -581d38fa877b2db15615989f335e9eaf +acccd2f4898bcea3e0f68d8ca132e6ff diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index 75ec4368a4..44db02ee59 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -0979b614a34f668eb47278448b254000 +939abc1a1671fbbdab249ba944fe5b85 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index a09c8e1bab..600c976cc2 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -e3f486ec383f9df4e4e7063959c88dd5 *./tests/data/lavf/lavf.mxf -525881 ./tests/data/lavf/lavf.mxf +64e49d7e44904049efb1085f0c8ebd51 *./tests/data/lavf/lavf.mxf +526393 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab -4de1237dea5f8377eed4c8effe037ffb *./tests/data/lavf/lavf.mxf -561209 ./tests/data/lavf/lavf.mxf +1bc3cd75f2e3a7e1b4586544fa015db1 *./tests/data/lavf/lavf.mxf +561721 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48 -73dec65269c3f5ebe67e4e7fa6f2f6b7 *./tests/data/lavf/lavf.mxf -525881 ./tests/data/lavf/lavf.mxf +0d805c05a9b0078727b3e8797dcaea95 *./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 62b96b4ba6..ae29dcbc58 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -ea6d7025d72df9aaf63bdbc2be8c82dc *./tests/data/lavf/lavf.mxf_d10 -5331501 ./tests/data/lavf/lavf.mxf_d10 +5074cc111fe19d9442e2a962dcf9e72d *./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 323abc330b..97b6807c93 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -2f8cb1656178419950a9a3505cae3f5b *./tests/data/lavf/lavf.mxf_dv25 -3833901 ./tests/data/lavf/lavf.mxf_dv25 +9376aa790712ef9cfba1ec9e9bacbad9 *./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 5e93737904..17870c87e3 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -9377a3afbf431442e17c5d891b4e6252 *./tests/data/lavf/lavf.mxf_dvcpro50 -7430701 ./tests/data/lavf/lavf.mxf_dvcpro50 +5170950bbd38d1b9868dbcea1fbf1e01 *./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 c5aac167b5..b04ef93111 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -ebf818890f92bb9710798a3e2ab571fd *./tests/data/lavf/lavf.mxf_opatom -4717113 ./tests/data/lavf/lavf.mxf_opatom +8965bbb1801e9c299510592cfe575e44 *./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 08cb7168dd..69b52963df 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -b79b636502d47239def6e85ab8cc06b3 *./tests/data/lavf/lavf.mxf_opatom_audio -102457 ./tests/data/lavf/lavf.mxf_opatom_audio +72c84169d102d91095bdfaf374e1b0f3 *./tests/data/lavf/lavf.mxf_opatom_audio +102969 ./tests/data/lavf/lavf.mxf_opatom_audio ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff