From patchwork Wed Jan 6 15:35:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24807 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E7B8E44BC83 for ; Wed, 6 Jan 2021 17:43:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD8E768A1B9; Wed, 6 Jan 2021 17:43:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6249A68A08B for ; Wed, 6 Jan 2021 17:43:09 +0200 (EET) Received: by mail-pg1-f178.google.com with SMTP id v19so2448405pgj.12 for ; Wed, 06 Jan 2021 07:43:09 -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=aqZEx1q8Ik2M7KMzbpZPXFnzRDhIy5V0VgzT5IYp+5Y=; b=ZF1thZfWQTOlYNiR991646Gd0wQmRFrxbX1Ujp6ArNYNh+So/vA9uOTGlB6iLHp1eh pwDCVp7sLyS7d3MWNRU/ZArz5V9+cWPlpduaxMCdDpl+ngn6stavI4aH19/z5rRropkZ XrCrpUidbO0Pgn+fr7XJ0sdDLBiDayIK5yVpGR9Iuoszjv1qwNJvC8TEoPsOfCGd/f4z /ckacRi9fzarBjybLf4+4Kycko+Vv5hPr8rRSTAuGp5ycuj/XtiDzvs8wVQYUCuMOIHC AQ82/MTRjktzhNKxzZYY4caxq3R022gOeRLvtJWaz82Do04tO4rSZE6aa3t/G2ugrfja 1DOQ== 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=aqZEx1q8Ik2M7KMzbpZPXFnzRDhIy5V0VgzT5IYp+5Y=; b=nLff6mhJ5e69FBi/GvWMLL4r9fY0XjiAp7EPsFcwBCHzzgfdb2LwFncQtaOiHrVX8D lUjFo26Gz3dcWC50HnGWblDL1wwsWrFUaefZjvjeOMtqdvl6mXO2V0wNTuphvH2sI6VV SAm7nhnNTM8yAEpGp0DVS8H+cS8TjS52L96iP4+35EdOH0o3psJDqiMkN/Ti83LiBRCf lHwsgTJMYsKC/wBTY2UXs8Sx/CwFLFmsk8kzuCcJkUG0a5tI7c1AQVjNOZD+L2ax0bNH UC6DIOmMR1kzjZUk6zSYaMrTj6mLuYwEWlHhBZwyGPperxUZ+W79ataINXM/kGJOa819 kBEA== X-Gm-Message-State: AOAM531BrZ+O2UA/znwhxapqAE+amEmORDip811ufqyJ0lsWXe/O63Bp 28krlE2X1RqVWGR9wO/44ekC76g481s= X-Google-Smtp-Source: ABdhPJzvvvNCJFtWBW3AHGw8SoiBfvnM52hvNWcbo/jRLc1YYEy/Pdh1ChJwX//WwiT1HfqPU/9xJA== X-Received: by 2002:a65:6152:: with SMTP id o18mr5134032pgv.392.1609947342412; Wed, 06 Jan 2021 07:35:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v15sm2937963pfn.217.2021.01.06.07.35.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 07:35:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 23:35:29 +0800 Message-Id: <1609947331-6849-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> References: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mxfenc: prefer to use the existing metadata 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Please check metadata with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf company_name : FFmpeg product_name : OP1a Muxer product_version : 58.65.101o => company_name : SONY product_name : eVTR product_version : 1.00 So need to update fate-mxf fate test. Signed-off-by: Limin Wang --- libavformat/mxfenc.c | 12 ++++++++---- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/mxf-opatom-user-comments | 2 +- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/mxf-user-comments | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 7fce7b9..a76a69c 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -724,16 +724,20 @@ static void mxf_write_identification(AVFormatContext *s) { MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; - const char *company = "FFmpeg"; - const char *product = mxf->mode != MODE_OPA ? "OP1a Muxer" : "OPAtom Muxer"; - const char *version; + AVDictionaryEntry *com_entry = av_dict_get(s->metadata, "company_name", NULL, 0); + AVDictionaryEntry *product_entry = av_dict_get(s->metadata, "product_name", NULL, 0); + AVDictionaryEntry *version_entry = av_dict_get(s->metadata, "product_version", NULL, 0); + const char *company = com_entry ? com_entry->value : "FFmpeg"; + const char *product = product_entry ? product_entry->value : mxf->mode != MODE_OPA ? "OP1a Muxer" : "OPAtom Muxer"; + const char *version = NULL; + const char *product_version = version_entry ? version_entry->value : AV_STRINGIFY(LIBAVFORMAT_VERSION); int length; mxf_write_metadata_key(pb, 0x013000); PRINT_KEY(s, "identification key", pb->buf_ptr - 16); version = s->flags & AVFMT_FLAG_BITEXACT ? - "0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION); + "0.0.0" : product_version; length = 100 +mxf_utf16_local_tag_length(company) + mxf_utf16_local_tag_length(product) + mxf_utf16_local_tag_length(version); diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index de4f26c..4aebcaf 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1 +1 @@ -68f0fa62b6a676894afbbe4c34ebf70b +84e289a83797e793bfa0d3a31f94ac6c diff --git a/tests/ref/fate/mxf-opatom-user-comments b/tests/ref/fate/mxf-opatom-user-comments index 90e3fb2..374a72a 100644 --- a/tests/ref/fate/mxf-opatom-user-comments +++ b/tests/ref/fate/mxf-opatom-user-comments @@ -1 +1 @@ -f6760a9e710ba478bc3949f3e5c9b34a +e7c41639b79ac54c4df05475fb0eea66 diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index 16022b1..6e3218f 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -73a891041b2fc836a893ffb49fff4fff +be4c1b76138c855ac3e2d2579cbecc17 diff --git a/tests/ref/fate/mxf-user-comments b/tests/ref/fate/mxf-user-comments index ddf51d9..46db6a3 100644 --- a/tests/ref/fate/mxf-user-comments +++ b/tests/ref/fate/mxf-user-comments @@ -1 +1 @@ -1255faf854223a74d707553121e5eca3 +8f2360104655971dc5fb68f98eda1b84