From patchwork Tue Aug 29 00:13:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4868 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp2662573jao; Mon, 28 Aug 2017 17:13:53 -0700 (PDT) X-Received: by 10.223.145.230 with SMTP id 93mr1481248wri.287.1503965633134; Mon, 28 Aug 2017 17:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503965633; cv=none; d=google.com; s=arc-20160816; b=FDspG6C6itBFyGUEPuxyuKyA/BGcmPDsjpCvUuxfM7f5IMXESR3DdUHuqvcE+IbN+J Gl2ixFCOcVHFTTtiSOJ4AWjXSYxd/uKvPHLT++/wXJiOU2xECPC7IHxaoA7iGq7SZTA3 oX9H7y6iUkyiDLWIyVDFT45Y6pWNrAodtzi4lRiZHW3c+JIyhNDPQW57KoVgp0pjCgp1 33j0XBLAgCXxnabqnUqLJ0M8tmFjlXo8zEIyouWc2k6TjTTRcbBDy6Wf1Pb8QFopHd0w V0vMirsWNPs89xtRDUbN8B5IMkij1HjBBAsXjB4tnCCzvSZqmZ7RIIUUAapU3aWvGH1g TdlQ== 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=igY1uB1WeJrC1LxKzt7qPx93p53SHeKkWDRnu8vgsJ0=; b=Ip3eJymmVTQUI2l6XJwUxd5fkL0fy2DlDPw1AEp9QBZIDox5chy31HeKYeBXNs3F0f m+xL2HRqJzIFKlGykmLR66c6QJVk4xhdkglkkT9UZj85MtMR64KkrY9Q8Ht+nrmEa1IR xjA4rxdq6Dxv6IE0cRtlfa77F8lIYrStOBW7mz6YX1V+f1EsryVZ+fs18TC0vffEDZtu HEpwkzogBXE1pEfY/0snbCh1HpU1NrvtQBwSHgyPw5q3I/cFMeMBM6JCKS7y1VHjeUHS bm3veHH8xMwJCNKaCpfnD4E1Qcq6xiWFGG//vTF6k1kOoG9UxvnfH3q8KfllW/F/9kIr jaTg== 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 k22si1246655wre.117.2017.08.28.17.13.52; Mon, 28 Aug 2017 17:13:53 -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 713DD68A067; Tue, 29 Aug 2017 03:13:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69CC268A04B for ; Tue, 29 Aug 2017 03:13:20 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dmU9q-0004A6-53 for ffmpeg-devel@ffmpeg.org; Tue, 29 Aug 2017 02:13:30 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 2oDM1w01N0S5wYM01oDN3b; Tue, 29 Aug 2017 02:13:23 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 29 Aug 2017 02:13:19 +0200 Message-Id: <20170829001321.1319-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mxfenc: Allow overriding numerical color_siting value. 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 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 12fc9abbc6..ccfa0d6341 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -322,6 +322,7 @@ typedef struct MXFContext { uint8_t umid[16]; ///< unique material identifier int channel_count; int signal_standard; + int color_siting; uint32_t tagged_value_count; AVRational audio_edit_rate; int store_user_comments; @@ -2085,6 +2086,8 @@ static int mxf_write_header(AVFormatContext *s) case AVCHROMA_LOC_TOP: sc->color_siting = 1; break; case AVCHROMA_LOC_CENTER: sc->color_siting = 3; break; } + if (mxf->color_siting >= 0) + sc->color_siting = mxf->color_siting; mxf->timecode_base = (tbc.den + tbc.num/2) / tbc.num; spf = ff_mxf_get_samples_per_frame(s, tbc); @@ -2668,7 +2671,9 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int { "smpte349m", "SMPTE 349M (1485 Mbps mappings)",\ 0, AV_OPT_TYPE_CONST, {.i64 = 6}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\ { "smpte428", "SMPTE 428-1 DCDM",\ - 0, AV_OPT_TYPE_CONST, {.i64 = 7}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"}, + 0, AV_OPT_TYPE_CONST, {.i64 = 7}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\ + { "color_siting", "Force/set Color siting",\ + offsetof(MXFContext, color_siting), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "color_siting"},\