From patchwork Fri Sep 7 08:03:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jay@wizardofthenet.com X-Patchwork-Id: 10264 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1317068jap; Fri, 7 Sep 2018 01:04:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaC18eVJ0ZO+auRlJEMeJjpBlHRO9HOpk8JEdaoF+vrPvflccTsy7WpHQsN9fFxweRepQHf X-Received: by 2002:adf:bb41:: with SMTP id x1-v6mr5062348wrg.24.1536307448239; Fri, 07 Sep 2018 01:04:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536307448; cv=none; d=google.com; s=arc-20160816; b=gi80JK2gdDwlg88YMPMaUVnSbJEwE9nwRyheX9BCVhc/wOfhXB8G3oZiP1RRrBcXRg cr7yLNv0IWc3BHpcJB37xnUfWPLr7uoUTbvc75e1E2jtYFHC9+ZV7Y+nUvlqv7LFdMu9 S4F8QyCWpm3Tt19EtOwJBQNGurf/IlDiqbtH/2XwrH9smcwNZTfvNaHC3bNpt/12W6Jm A88ipxSVZMG1X/zmCad2wYLhugp+xIJ+6/qw8et2f2EjH3wzR1o2MZc5NEcwMS6UjgWt QWdbYVzSHIwp85tdZ5qG3HnYnSq+n8cZ2BXMnrlJa/JQzPKGOdWKN5TsfAJOXVz2IIjN jI3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=NQ9S6WeXT1IWdPmbejtkHzKKvvLRXbpQdm0In9z0uqo=; b=kHiZe0t417g/Se5NXE7xjVAg9m23f+eLCdLzI4ezcdcnHOQktHjIZCCcQl7yc5o8+E zhAff0OXBZRv6Nq5qjlcerDypHCf+2EB3Ojh3kuUoqJqKZFo0xXpgOBhcTmZ76h9/b1u ILIQXmZuWuweymiaONQenwopLP9pCSD5+IBcNEk5CXPUfqEo1LN/ZLW4HT3lq4WAxqFk pw8ba0bkeU420hYhhpKGDuKqT8ZVbqijZjLGCV0pZSCBZuz0/fydjKPsiO8idj2TleHv k+pHkGBFngEZeIjhBVLG/4a+56cqk1WVRy/G4xkY2T6SfJcyZI2HDBCGEdXWSUAEGqo4 7AuA== 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 z17-v6si6942676wro.40.2018.09.07.01.04.07; Fri, 07 Sep 2018 01:04:08 -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 4484268A1BB; Fri, 7 Sep 2018 11:03:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp121.iad3b.emailsrvr.com (smtp121.iad3b.emailsrvr.com [146.20.161.121]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8547E68A1AD for ; Fri, 7 Sep 2018 11:03:37 +0300 (EEST) Received: from smtp8.relay.iad3b.emailsrvr.com (localhost [127.0.0.1]) by smtp8.relay.iad3b.emailsrvr.com (SMTP Server) with ESMTP id 3A7AA40076; Fri, 7 Sep 2018 04:03:39 -0400 (EDT) X-Auth-ID: jay@wizardofthenet.com Received: by smtp8.relay.iad3b.emailsrvr.com (Authenticated sender: jay-AT-wizardofthenet.com) with ESMTPSA id C83CF4006A; Fri, 7 Sep 2018 04:03:38 -0400 (EDT) X-Sender-Id: jay@wizardofthenet.com Received: from localhost.localdomain (cpe-76-89-145-17.socal.res.rr.com [76.89.145.17]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256) by 0.0.0.0:465 (trex/5.7.12); Fri, 07 Sep 2018 04:03:39 -0400 From: Jason Stevens To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Sep 2018 01:03:13 -0700 Message-Id: <20180907080313.25744-3-jay@wizardofthenet.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20180907080313.25744-1-jay@wizardofthenet.com> References: <20180907080313.25744-1-jay@wizardofthenet.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] libavformat/mxfenc: add missing dnxhr mxfcontainer essence ULs 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 Cc: Jason Stevens Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Add missing dnxhr mxf container essence ULs to the mxf encoder. set proper mxf frame size for dnxhr using libavformat/dnxhd's get dnxhr size function. This fixes dnxhr mxf files being quarantined by Avid Media Composer. Signed-off-by: Jason Stevens --- libavformat/mxfenc.c | 53 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 7f629dbe53..96e8a859de 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -146,6 +146,11 @@ enum ULIndex { INDEX_DNXHD_720p_8bit_HIGH, INDEX_DNXHD_720p_8bit_MEDIUM, INDEX_DNXHD_720p_8bit_LOW, + INDEX_DNXHR_LB, + INDEX_DNXHR_SQ, + INDEX_DNXHR_HQ, + INDEX_DNXHR_HQX, + INDEX_DNXHR_444, INDEX_JPEG2000, INDEX_H264, }; @@ -345,6 +350,31 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 }, mxf_write_cdci_desc }, + // DNxHR LB - CID 1274 + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x28,0x00,0x00 }, + mxf_write_cdci_desc }, + // DNxHR SQ - CID 1273 + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x27,0x00,0x00 }, + mxf_write_cdci_desc }, + // DNxHR HQ - CID 1272 + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x26,0x00,0x00 }, + mxf_write_cdci_desc }, + // DNxHR HQX - CID 1271 + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x25,0x00,0x00 }, + mxf_write_cdci_desc }, + // DNxHR 444 - CID 1270 + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, + { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x24,0x00,0x00 }, + mxf_write_cdci_desc }, // JPEG2000 { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 }, { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x08,0x00 }, @@ -1959,7 +1989,11 @@ AVPacket *pkt) header_cid = pkt->data + 0x28; cid = header_cid[0] << 24 | header_cid[1] << 16 | header_cid[2] << 8 | header_cid[3]; - if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) < 0) + if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) == DNXHD_VARIABLE) { + frame_size = avpriv_dnxhd_get_hr_frame_size(cid, st->codecpar->width, st->codecpar->height); + } + + if (frame_size < 0) return -1; if ((sc->interlaced = avpriv_dnxhd_get_interlaced(cid)) < 0) return AVERROR_INVALIDDATA; @@ -1998,6 +2032,23 @@ AVPacket *pkt) case 1253: sc->index = INDEX_DNXHD_720p_8bit_LOW; break; + case 1274: + sc->index = INDEX_DNXHR_LB; + break; + case 1273: + sc->index = INDEX_DNXHR_SQ; + break; + case 1272: + sc->index = INDEX_DNXHR_HQ; + break; + case 1271: + sc->index = INDEX_DNXHR_HQX; + sc->component_depth = 10; + break; + case 1270: + sc->index = INDEX_DNXHR_444; + sc->component_depth = 10; + break; default: return -1; }