From patchwork Tue Dec 5 04:46:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 6553 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5238227jah; Mon, 4 Dec 2017 21:19:01 -0800 (PST) X-Google-Smtp-Source: AGs4zMZCOgt3rc/c3TUMHO0zifj8ndDp78S+45P7gRXOs20a3X7uwqHtg0sNvcFyfzMPMD5JukRX X-Received: by 10.28.19.1 with SMTP id 1mr8755223wmt.20.1512451140996; Mon, 04 Dec 2017 21:19:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512451140; cv=none; d=google.com; s=arc-20160816; b=t6ulo0QxXkVZGNS7NCZPVVtmbBJzpwGTzsxoRyZ2Y+gwsfAkPUdkSuNRQQQOZutzwo kQ/XBjp1+ldufnqD+sXYMMBHaJERxdfJLOG+hOsM49S8eotRMztjBteIhi+vL8fzEIcc XvElTHXBO+hCY0O3Pwu5NAnrWkw4+ft9dstTFrAfVurN9he1gZ7nVhCf67gFwygGp34i l1EOmpYXvojHgS+4b/Zdsc9rSZsft5I7YznTlda2mcLyq3Dwp572p0DAnF2wTqG78xxT CpY0ZKm4reIVCYcJg2esGjNqb9JawY+dmV3qRIyFRMeUjXaJUNMoRMxs6yYr42C7LWne mLXQ== 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=69S1jJcFBxQGoiKk2B1QBKkHYOwhki+pnL3kLh/aq4E=; b=uZkzxpvSSR16v/hlFDHF0KsKbjzE6xOCO7fvhSdoeHepTGrfLRF1cFAOpMRcUcQU3X DeWPZeCT+UvOhFNvHyY4zlv+SM3q0sXouGrH5EqyBQ/FvDVa436D4+ajD2CwD+HyDkYz LKKXHXcIC0J6UGOFJUdksRDZCzaDbLoh8CuXtHZM+X3QcylSfLllM/P186TPPJjnLoCL E+uy/59yGqI0BBi+P5uDa6M4OsTvckpXJQJxZNuB49UwsPIG1On9TVlipBNQIUj7NSdG TRhxZfYmoCApl6GhSsx0ZcX0SirdehAiREs5cG6z7STMmWamYtlQ3O1PUnWOIXIT7HYz FvbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KzG+jZSC; 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 j13si2260911wrj.386.2017.12.04.21.19.00; Mon, 04 Dec 2017 21:19:00 -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=KzG+jZSC; 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 AF937689FE9; Tue, 5 Dec 2017 07:18:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1001E6898B9 for ; Tue, 5 Dec 2017 07:18:46 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id a90so10402363pfk.1 for ; Mon, 04 Dec 2017 21:18:52 -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=Goxbcs+zF2Epg9afsu3HprAFBPhusjPIJTDvhFQYL+4=; b=KzG+jZSCYmXlYMBT3jr70R2EU54IscwIWnVAZYdhDgz1S3rKpOsomgwlQ8CAeaC005 iayERRpm8ptAt6F1zV6uEEPAJTVBM6PXLQ6ekHipynKKk6rGIMOb7cEk2YeQ2lEvX+jN NI+KwvYqExv84MZhMR1usiZV6asdUz1yqSc87W+2KnwMfT9oVZFsWWV8PZPAMnIS9hoQ fADoLrwifnvWW4Unk4OYQony87LMfzDRv6hdN5BI1aZYYZ7ZEHad93Qo1u0W0emjFilm d7naMuexfpDgFwslQcu060KER61CEeyS8CIMkZ3+hwCSCaF+z2Xrwrh3hq2kUURWYkCi Q4ZQ== 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=Goxbcs+zF2Epg9afsu3HprAFBPhusjPIJTDvhFQYL+4=; b=f8phhTICGHZ0bmTN1GNJ6faEXBI1U1k1+zulzdKTHlT1hjGlHaJ5YTOGa9np+0G973 6Ud9le7qAM+bYjS4Inv3gjKTxN7Xjfpdi8ieH4wclHBC/MccLs4rtCPsqrcuJzmXqlz6 sK+GcY4Wy1/BNwMzzLLZ+jJAQvK8LNFbCKFQ8SC2xRubHAoNKmlZUvjyoxBy5HiMBzlm CJ4heLxVG6Vdk6SpNVpkAMYTqE3j7/31C57GE/IbmdQyptatiFmYUtC9cMEHadR9GQya IWtNGWiBfFAT+/vCPCvENsyewJt7yww0LfLNunb35NTiWd8qxapEdmKag8XKcfDpTqKo WB9g== X-Gm-Message-State: AJaThX6z82FTfancLpPCmKDYfjyFGejl50bPqjVOgDYlaJ+jRh18RQ+2 fK6/NwlxYkp5PRtJaLtDIFuV3A== X-Received: by 10.84.244.75 with SMTP id e11mr16839540plt.18.1512449195237; Mon, 04 Dec 2017 20:46:35 -0800 (PST) Received: from localhost.localdomain (S0106ac2e8b9e4f8e.vc.shawcable.net. [174.7.100.154]) by smtp.gmail.com with ESMTPSA id m87sm29160764pfi.88.2017.12.04.20.46.32 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Dec 2017 20:46:34 -0800 (PST) From: Mark Reid To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Dec 2017 20:46:22 -0800 Message-Id: <20171205044623.77938-3-mindmark@gmail.com> X-Mailer: git-send-email 2.13.6 (Apple Git-96) In-Reply-To: <20171205044623.77938-1-mindmark@gmail.com> References: <20171205044623.77938-1-mindmark@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 c9694f2a4e..3bb70326fe 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); } /* @@ -1418,7 +1436,7 @@ static void mxf_write_package(AVFormatContext *s, MXFPackage *package) mxf_write_structural_component(s, st, package); mxf->track_instance_count++; - 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); } @@ -1453,12 +1471,13 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s) AVDictionaryEntry *entry = NULL; AVStream *st = NULL; int i; - - MXFPackage packages[2] = {{0}}; + MXFPackage packages[3] = {{0}}; 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; @@ -1476,6 +1495,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);