From patchwork Sun Jan 31 23:50:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 25312 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 B483D448B48 for ; Mon, 1 Feb 2021 01:51:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 932C2689CC9; Mon, 1 Feb 2021 01:51:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AA98689A12 for ; Mon, 1 Feb 2021 01:51:06 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id x9so3073804plb.5 for ; Sun, 31 Jan 2021 15:51:06 -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=QiMU5eHdv+beuxk6HH1BpPtJhkf2S4tvqlRxzm6/k/s=; b=UB0V6dJ/1HxBGu0Lk6ef2AtXCKnRkAKj1GB70YgExJvTtMgRoue71HlfZEPGC43xHu Px0iX6zPKg4IKGgNc453D8HiFf6D2fyzg93q9qnoUTjyv5GLHrs0mGh9EwOi18/GI/MZ SnBzljydtKB6R4Pac7/4gcYSpk/I6U6+poK5PrPbulfa3qScDAyiHkhYI+LFoTOsfnMA m3f0Hehu2s60ZbdWjExIb6lG1oCZKz4JDrLM5ahr462tcLAcM9d5WgQf3VUuo/sT6DKW 8msgFLoqx83Sr2f+dHpIXUF/hnKiY0MbR/xDIFU0CnLtDt7gvyODPOPyEVvCjthMIuEk RXYw== 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=QiMU5eHdv+beuxk6HH1BpPtJhkf2S4tvqlRxzm6/k/s=; b=G2r19VOwiYY+WbLGjp5kf4rdr4dsAiI7UteNKbP45f+WZxwk2AvK1aug9JqgO/WnYC xm4IR4i4CQMstTyX0DF8P9MWGO24XySw3MYJCYWvvHIdd16t/VR2GwFGOwFQY+511QTh x1u2Ts06JtblUiPQtrcyh8eOLYH/qkaZrnhJw8OTqwAvfcQom/Bh3rNLFxdoFKLqmzz6 nB1SyE4mR7YmajhxMrg4SD5kRylETZQLlcdy3+tPrzKQ1UimqoQrQcOOnbkbdLOl3s9c yt3xc11RN0zrihx3GZjOtVtRYZOC3PaRoz4VjzCqZQgq792fIiyBazp1U97uMVgqgfZ+ FTiQ== X-Gm-Message-State: AOAM533AVaQGDyrJf6kXvvwHKdx2kHjILhBDDtCBABH0ww/DsKGTYASW eZPs5mZ27Iolz+z83aP1toI8YIF1/N0= X-Google-Smtp-Source: ABdhPJzkDltB60tSJ7mB+h4d4EWHoyNKJlayrw3tDvLbWjz2gXHxFBsVhvqp2oWyBtjdM2x+lSVrwg== X-Received: by 2002:a17:90a:bd8c:: with SMTP id z12mr14455465pjr.204.1612137064180; Sun, 31 Jan 2021 15:51:04 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e20sm15704444pgr.48.2021.01.31.15.51.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Jan 2021 15:51:03 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Feb 2021 07:50:55 +0800 Message-Id: <1612137055-19114-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1612137055-19114-1-git-send-email-lance.lmwang@gmail.com> References: <1610168848-17933-3-git-send-email-lance.lmwang@gmail.com> <1612137055-19114-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 3/3] avformat/mxfenc: prefer to use the configured metadta 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 The metadata company_name, product_name, product_version from input file will be deleted to avoid overwriting information Please to test with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf and ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy \ -metadata company_name="xxx" \ -metadata product_name="xxx" \ -metadata product_version="xxx" \ out.mxf Signed-off-by: Limin Wang --- fftools/ffmpeg_opt.c | 3 +++ libavformat/mxfenc.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index bf2eb26..07308cc 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2641,6 +2641,9 @@ loop_end: if(o->recording_time != INT64_MAX) av_dict_set(&oc->metadata, "duration", NULL, 0); av_dict_set(&oc->metadata, "creation_time", NULL, 0); + av_dict_set(&oc->metadata, "company_name", NULL, 0); + av_dict_set(&oc->metadata, "product_name", NULL, 0); + av_dict_set(&oc->metadata, "product_version", NULL, 0); } if (!o->metadata_streams_manual) for (i = of->ost_index; i < nb_output_streams; i++) { diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 64d6314..26b4b50 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -724,9 +724,13 @@ 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); const char *platform = s->flags & AVFMT_FLAG_BITEXACT ? "Lavf" : PLATFROM_IDENT; int length; @@ -734,7 +738,7 @@ static void mxf_write_identification(AVFormatContext *s) 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(platform) +