From patchwork Mon Oct 2 10:38:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5376 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp1362133jan; Mon, 2 Oct 2017 03:38:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDP6tjM1QweC137QfAi7Sho9labsnTiTQa/T8DS1EzBF2LDkH0MrR/BRNqwTXTu2pxX4WdT X-Received: by 10.223.175.56 with SMTP id z53mr2130114wrc.177.1506940722537; Mon, 02 Oct 2017 03:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506940722; cv=none; d=google.com; s=arc-20160816; b=sSEJRnQxbz8dXuS4dBV4RcsEbGrmKRpPrkM/cnpqrbVGrwHmBO7TXTip6NIRlD8iGY SaTWV9YtPDPZA/QgOxnjCX4k+tLqVZK5AksUbyEI2nnDf0PsvcMVzezv4tvnp206I7Qq 3RLvGBpJUB7fopGxYYdybB6AG64qgvj/IvyBxMQ5EWWyNBqD6c/Ke0VuaNP3W3Dn1pZO tvcQyEtvSqevKKRiQzf4wuU0xPF1uVNkznTCBTLcwzXkle9uY8Uqck+cl7pUtIIVh+0G j8pLrY6i9I9idAjgw4LIObeL36FslARCWu29+G+8Td0OS0LGwYuOlKRWS9DvIaL1KEp/ Tz9g== 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=zd2ArHQtQgGAZEo5ns7l7Hz/F+8p22ufQ8cavRtW6VU=; b=KbOn5UaZKOY87ivwMvCXC97ijNsRgW61hbuXCrFejQzzAWlZbFUAHJL2PKSJfXzOLK 6Xq2neA3SD+Lk/CHvhbxNHYiUiSWFlGawKoUh0glu+4hshUoveZdoTgo3Oz55onKWGkd 9LiSuC0lq25zBj8axwoIy1HIYjvKjmOhBS7z4fzH+9z9HJPWTFEh3KjiSRb45d31fkzE ILNJpqJiHf5ZEhKxdH0uDWMzdugzLhofzW0DECSvRe3GPJAGEPBrUAn8DKsqOvo+H1P6 N/wU17lj6u/mRvkM01iR15rtIpj11k9th1++c4BTB1HI4OZon+tPMuOMxOMaq2Zqo4eB 5XQQ== 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 z192si5284252wmc.205.2017.10.02.03.38.41; Mon, 02 Oct 2017 03:38:42 -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 0C118689D31; Mon, 2 Oct 2017 13:38:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B4A9689B96 for ; Mon, 2 Oct 2017 13:38:17 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dyy7L-0002bb-A0 for ffmpeg-devel@ffmpeg.org; Mon, 02 Oct 2017 12:38:31 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id GaeW1w00Z0S5wYM01aeXSS; Mon, 02 Oct 2017 12:38:31 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Oct 2017 12:38:28 +0200 Message-Id: <20171002103829.28866-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mxfenc: Add IEC DV25 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 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index b8d3030c40..3da96bf919 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -119,6 +119,8 @@ enum ULIndex { INDEX_DV, INDEX_DV25_525_60, INDEX_DV25_625_50, + INDEX_DV25_525_60_IEC, + INDEX_DV25_625_50_IEC, INDEX_DV50_525_60, INDEX_DV50_625_50, INDEX_DV100_1080_60, @@ -231,6 +233,7 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 }, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00,0x00,0x00 }, mxf_write_cdci_desc }, + // DV25 525/60 { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x40,0x01 }, { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 }, @@ -241,7 +244,19 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 }, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 }, mxf_write_cdci_desc }, - // DV50 525/60 + + // IEC DV25 525/60 + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x01,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x01,0x00 }, + mxf_write_cdci_desc }, + // IEC DV25 625/50 + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x02,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, + mxf_write_cdci_desc }, + + // DV50 525/60 { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x50,0x01 }, { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 }, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x03,0x00 },