From patchwork Wed Nov 29 04:11:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 6438 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4031970jah; Tue, 28 Nov 2017 20:16:50 -0800 (PST) X-Google-Smtp-Source: AGs4zMbpfHcRlys0fh7zWeH5IbC0o0veEDp4eRv+Sa9pSW1EXLsMovqIDgG1ACufz+W/e+qhy8cV X-Received: by 10.223.150.118 with SMTP id c51mr972865wra.202.1511929010773; Tue, 28 Nov 2017 20:16:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511929010; cv=none; d=google.com; s=arc-20160816; b=mbC5Wuik1rz2Bn6QCT5Pj1KyM43n2TCRZrFYbXWgOyQAtolsQnTgztfTqpkYQeAejm vpBM/ixOF6iDyYVH0KJVDUvNf/k5B8vDK9eCh0nush60lWM53McDG/xHstcHl8H7R7ob w/iJn9m74v3z7wreP6uSUIAqH9Tn0zEeAyiDbYE6lMAWsU+l8PJXllIQ9s3ROLB9PGJ8 L7+FtZA5nzZyodG5kOlKYy4crIM+FDNtIdpO6/Vul7FK7IZ0k65XgfJT3w6zuuFdel3n 1N43M1eyo/y5TANNZqmR5JjbJevUMQdPqOIa4AOnuINkDJK561AU5bnHxLMpwbWGrxiv cPLg== 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:cc: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:dkim-signature:delivered-to:arc-authentication-results; bh=/l0mWoGE2q1i8X7PL16RdC3QuOx9CFcD3Qwn6K/TrAQ=; b=HE61XbK3G0QHyikdkrCFP0g6M7Svbm1sBDLqNwsomIZtuMQxwa9hlAnN7jJcxPWqYr vrumzaEmEps6roPo6tGi4l0CCNqSaHh0vKMttJN+9zJbstUaEMJvcegpqEh7qJk0pKXK v1JkNZFhBTwPJ1VfjFQ3zy6iDk3OWIYzyZY5QKycc5KwTIdFLod3tkxn5LJBwI9RoTRL yrdV/fx8XEw88DvxTIrLy1RlrxPRQ6RYOslhP3CwhGjBCSlIsCwv7Ocv3CjIXm/3d20K Ql/AaG4E6x8mNKqEGh1jNStqE/VHhBnPf22HlYPmE298lEIxwA9yz7Xuf/7+JKMdM21t ejCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EJK01W82; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k18si680302wmd.246.2017.11.28.20.16.50; Tue, 28 Nov 2017 20:16:50 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EJK01W82; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D485768A153; Wed, 29 Nov 2017 06:16:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E809E68A041 for ; Wed, 29 Nov 2017 06:16:39 +0200 (EET) Received: by mail-pl0-f68.google.com with SMTP id 1so1328307pla.7 for ; Tue, 28 Nov 2017 20:16:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8YE29VOcEqpVL/uGVj6t23aYCE0VAIZosiogJFRE5hg=; b=EJK01W82EvhjF67PC6AcYRYPyXEUPYp0JASyNo3B3lXewUGpEEtrleI0aYjuaSsH7T v8dpvdiuuy07v8J05CPuWSqXBFIo0YI9pUyATb2isJw0jz9uzD6HJNJRL5C1+WEdP47w fVvMSnFtu88CmKM0Hl35YLVRAGcjpCJg/dn5ogHpNMeaEB+dpveakCbaeabbucEs/5ix x8Gr+YsNxkzf4mDwhKemrD4eppCd15+gwTr+n9euj9dGxkoIuTX1q6wAj3UvVrA6nhHT AgNqO91jSCb3ohJgUUq2ECo+keVqC6+O3ZViQvfxH9K8D/NgQbspADWOby675QXRi0Ij SSPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8YE29VOcEqpVL/uGVj6t23aYCE0VAIZosiogJFRE5hg=; b=cEahoBYv1KNegiZk7sk8M3U1n6qxZ3xwak3B9R0WtNeUzSFUzzwh4dwu9RZq8Tlrzu cSb2LXEvqDUp8q8ipp6zxe9NxqZqrSCFPbhTtilx1nGQn6vDfCCokr5fEp+IgwiCmcGW DURnLhd3GaqexvTLNuQ3jpVudgoNvbk58srKRneRGdG5VHUkyVxq8+PPq2OR22XCiANH A7tkyisjdJO8RjnU4nfZ5X2Da6tLsnBMFv9zYLRUu/OQhec6HTQ1y7gtWCGz2rwsBlaW ike8UITFG6tCwH/N5iTEijP1V/+kYh/6+BOCqxegIZiu6Jc3wjmAfi6TIL6LldB4LKlZ QYGw== X-Gm-Message-State: AJaThX6Sv373mAJLq5drG+4fcew6VrBo6gjkPuizwGNCZVnr2ICGSuYx bdDiqn35NXcBdGOwc1tzM9y1Ag== X-Received: by 10.159.242.196 with SMTP id x4mr1557879plw.342.1511928673626; Tue, 28 Nov 2017 20:11:13 -0800 (PST) Received: from localhost.localdomain (S0106ac2e8b9e4f8e.vc.shawcable.net. [174.7.100.154]) by smtp.gmail.com with ESMTPSA id w73sm799021pfd.86.2017.11.28.20.11.11 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 28 Nov 2017 20:11:12 -0800 (PST) From: Mark Reid To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Nov 2017 20:11:04 -0800 Message-Id: <20171129041105.16748-3-mindmark@gmail.com> X-Mailer: git-send-email 2.13.6 (Apple Git-96) In-Reply-To: <20171129041105.16748-1-mindmark@gmail.com> References: <20171129041105.16748-1-mindmark@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/mxfenc: write reel_name if metadata key is present 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: Mark Reid MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mxf.h | 1 + libavformat/mxfenc.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/libavformat/mxf.h b/libavformat/mxf.h index 2d5b44943b..ffcc429a8b 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -47,6 +47,7 @@ enum MXFMetadataSetType { EssenceContainerData, EssenceGroup, TaggedValue, + TapeDescriptor, }; enum MXFFrameLayout { diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index baaeb8c617..02192aa22b 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -105,6 +105,7 @@ typedef struct MXFPackage { char *name; enum MXFMetadataSetType type; int instance; + struct MXFPackage *ref; } MXFPackage; enum ULIndex { @@ -991,20 +992,33 @@ static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, MXF // write source package uid, end of the reference mxf_write_local_tag(pb, 32, 0x1101); - if (package->type == SourcePackage) { + if (!package->ref) { for (i = 0; i < 4; i++) avio_wb64(pb, 0); } else - mxf_write_umid(s, 1); + mxf_write_umid(s, package->ref->instance); // write source track id mxf_write_local_tag(pb, 4, 0x1102); - if (package->type == SourcePackage) + if (package->type == SourcePackage && !package->ref) avio_wb32(pb, 0); else avio_wb32(pb, st->index+2); } +static void mxf_write_tape_descriptor(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + + mxf_write_metadata_key(pb, 0x012e00); + PRINT_KEY(s, "tape descriptor key", pb->buf_ptr - 16); + klv_encode_ber_length(pb, 20); + mxf_write_local_tag(pb, 16, 0x3C0A); + mxf_write_uuid(pb, TapeDescriptor, 0); + PRINT_KEY(s, "tape_desc uid", pb->buf_ptr - 16); +} + + static void mxf_write_multi_descriptor(AVFormatContext *s) { MXFContext *mxf = s->priv_data; @@ -1388,13 +1402,17 @@ static void mxf_write_package(AVFormatContext *s, MXFPackage *package) } // write multiple descriptor reference - if (package->type == SourcePackage) { + if (package->type == SourcePackage && package->instance == 1) { mxf_write_local_tag(pb, 16, 0x4701); if (s->nb_streams > 1) { mxf_write_uuid(pb, MultipleDescriptor, 0); mxf_write_multi_descriptor(s); } else mxf_write_uuid(pb, SubDescriptor, 0); + } else if (package->type == SourcePackage && package->instance == 2) { + mxf_write_local_tag(pb, 16, 0x4701); + mxf_write_uuid(pb, TapeDescriptor, 0); + mxf_write_tape_descriptor(s); } // write timecode track @@ -1410,7 +1428,7 @@ static void mxf_write_package(AVFormatContext *s, MXFPackage *package) mxf_write_structural_component(s, st, package); mxf->track_uuid_offset++; - if (package->type == SourcePackage) { + if (package->type == SourcePackage && package->instance == 1) { MXFStreamContext *sc = st->priv_data; mxf_essence_container_uls[sc->index].write_desc(s, st); } @@ -1445,12 +1463,13 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s) AVDictionaryEntry *entry = NULL; AVStream *st = NULL; int i; - - MXFPackage packages[2] = {}; + MXFPackage packages[3] = {}; int package_count = 2; packages[0].type = MaterialPackage; packages[1].type = SourcePackage; packages[1].instance = 1; + packages[0].ref = &packages[1]; + if (entry = av_dict_get(s->metadata, "material_package_name", NULL, 0)) packages[0].name = entry->value; @@ -1468,6 +1487,15 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s) } } + entry = av_dict_get(s->metadata, "reel_name", NULL, 0); + if (entry) { + packages[2].name = entry->value; + packages[2].type = SourcePackage; + packages[2].instance = 2; + packages[1].ref = &packages[2]; + package_count = 3; + } + mxf_write_preface(s); mxf_write_identification(s); mxf_write_content_storage(s, packages, package_count);