From patchwork Thu Jan 7 10:43:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24820 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 B499D44A79F for ; Thu, 7 Jan 2021 12:43:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E6A3689995; Thu, 7 Jan 2021 12:43:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6B12688136 for ; Thu, 7 Jan 2021 12:43:45 +0200 (EET) Received: by mail-pf1-f172.google.com with SMTP id c79so3619652pfc.2 for ; Thu, 07 Jan 2021 02:43:45 -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=JDF43S4o9MRXT6A+kL7j2MRHn5aNmO1WEpR6AQ/PTus=; b=aCy2LRul+I5PVdt8FAbm+zmwTp9HsmY1Ml5gkVf4LHKtUWZQWj940Yyztk7hYvvXeK PFEbsL+QSBSHmI3sYWucSY/H3P83AvyGR68QZDee2uxW4UqTy+fYJFmWaL0TIxwt9TDa I7tpccUES3R0ibjDGqLGBB3DtpxD1DBymA6Meof6+DeG/5sgYb5gzVASBmsoHlfsQ0/V VrPxwiF16bvu7QLIakIsNmWAOZnlnt5Zsu6oBqfWry/QLenxShRmnRkzVWuxxuhWvNLo O7vNindZW+HdI68SUPsehaRPOaRchgrbGDZGS+3qhKbgYjAkirGDvwz88291rGMZo2A8 aq0g== 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=JDF43S4o9MRXT6A+kL7j2MRHn5aNmO1WEpR6AQ/PTus=; b=Wo2qxCY1aLNlEkKtH9LcdTEkGYZAiwBfQkMsLm5OKFXuXDEhPOpg/D4aQiNfvwcG0t iNzeDbVS5Tvu1ZSmW5lDYFiai2CkUvsRZArTroL55oqZ4VEZP9vm5uFFdapKeQkocmll hdQod0T/8D6E6BYwQgXssWM2XrH+hY+zfEZRPK236SrfpL+w/dpLHu/uujyxyCXSOMSi gLpVshW5bIMVaIndlnJAIRBMJ/bCAuoso/PD0ZybksA4upGSNiwDbSb4uI70dFOYwGoG DBTam3vuhA9kGtaQiAt5BdCF3aOgPtJs939yXRSAm/N7P921jV8P1zWSLkav1WkTK0U+ gvqQ== X-Gm-Message-State: AOAM5335o74cVt8whmQnGFYHShulm9S0CVFZzOtzjW4oh3Z5vVqVVFEG i5QY+K6G6YxspLaZIRbYYoX5fiELMgQ= X-Google-Smtp-Source: ABdhPJwzWUIYeYRR2Jbx3i+TeziSjIr3uss8b/hblcL7JDGWsRRNu6fzEjTPU+VJvTq3zE4bQRZTUA== X-Received: by 2002:a62:2606:0:b029:1a5:a755:5568 with SMTP id m6-20020a6226060000b02901a5a7555568mr8344763pfm.65.1610016224144; Thu, 07 Jan 2021 02:43:44 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a23sm1769493pju.31.2021.01.07.02.43.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 02:43:43 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jan 2021 18:43:19 +0800 Message-Id: <1610016199-29309-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> References: <1609947331-6849-1-git-send-email-lance.lmwang> <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] 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 d8678c9..5244211 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -722,16 +722,20 @@ static void mxf_write_identification(AVFormatContext *s) { MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; - const char *company = "FFmpeg"; - const char *product = s->oformat != &ff_mxf_opatom_muxer ? "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 : s->oformat != &ff_mxf_opatom_muxer ? "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