From patchwork Tue Feb 2 12:47:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 25344 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 8008944A16B for ; Tue, 2 Feb 2021 14:47:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68EC4689D7A; Tue, 2 Feb 2021 14:47:40 +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 2902A689D89 for ; Tue, 2 Feb 2021 14:47:33 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id y10so8150321plk.7 for ; Tue, 02 Feb 2021 04:47:33 -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 :mime-version:content-transfer-encoding; bh=t4tP2OmYH0ocvJGwg1Er+fcNTYvyQbg5CV2SjjHmiXE=; b=m+Nt2R40oSBaXBVukxJKxU1h1KNeU1WonZ90qWxuvJnxTkVWUdInS1tbbhWSehAovG XItF1zao0Kyj/OGXVBYbRdGdI79Lk4NzuVR6xGKclVi23vrRjvfSUDhyzPUEwKZwoUSr B6MUJvR/fdA+bAOux4NtUTT/CiSNlnFcmGCYCn8sUbYkhvUT8/RSRNj9bE+ePqYrfWNm w2Xdfyk5t2gobM2z9QWLcNxB5tSOEyTZ21UA65EXX8Nh6k046f75D6PpPPme29fni5QE GME+BE126dV8KLKYZIiRkjQwd0m7sQgwTJmgKndAJEKqE30DBebTXCcEzfC4TDS0rYMP CZMA== 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:mime-version:content-transfer-encoding; bh=t4tP2OmYH0ocvJGwg1Er+fcNTYvyQbg5CV2SjjHmiXE=; b=HsE0rdny+L3D4ozYQoHQ6oKec60pjRWBWq86cIZy40JBcKa5bUBOTUAhq49efqptFe AIgaW9lUZYoUVicPjQLDURD+v+caqZ1CMpL0hqVWrey13WT4dv90lJ6JBEPW8uC9W4D4 /gnYvYAHcCzecvLvqaY4/r2YcjFeubpSILESqF4DjqMmfGUu6x/SXDX8OQIVBK3vQMdK jlB/mtw/5qOq1zIe4RygMgx1aFReO+FAMkuljCBc3/XK82Pkymwz8ZM6wcKxWloGwO4y Ql0E7Wga6nxSW9Z9Co7t8f7WLSgfU2rluEpkecZvrzNA1tS1rq+Fj6dvEhfd07Y3fbhE sL/g== X-Gm-Message-State: AOAM533ixgfqBuGndHTS+Kt5TrNnKgcPKffQLn5y7Wf3p92VJdursrqA zGeC/a6DJlYkycQYM2uGvzmshot+CO8= X-Google-Smtp-Source: ABdhPJyEP9bZIRIHJYzubKrpSCB8ipiM0IFkVWLqR4p+PsGRl5met2T0pklpLKfJepqVYYLA4FYlpw== X-Received: by 2002:a17:902:82cb:b029:e1:2b0f:da57 with SMTP id u11-20020a17090282cbb02900e12b0fda57mr17814347plz.33.1612270051111; Tue, 02 Feb 2021 04:47:31 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 24sm21250368pgt.14.2021.02.02.04.47.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Feb 2021 04:47:30 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Feb 2021 20:47:19 +0800 Message-Id: <1612270039-6379-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1612270039-6379-1-git-send-email-lance.lmwang@gmail.com> References: <1610168848-17933-3-git-send-email-lance.lmwang@gmail.com> <1612270039-6379-1-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 3/3] avformat/mxfenc: prefer to use the configured 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 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 commands: ./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 Reviewed-by: Tomas Härdin Signed-off-by: Limin Wang --- fftools/ffmpeg_opt.c | 3 +++ libavformat/mxfenc.c | 10 +++++++--- 2 files changed, 10 insertions(+), 3 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 39ab443..0b39917 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -757,8 +757,12 @@ 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"; + 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 *product_version = version_entry ? version_entry->value : AV_STRINGIFY(LIBAVFORMAT_VERSION); const char *platform = s->flags & AVFMT_FLAG_BITEXACT ? "Lavf" : PLATFROM_IDENT; const char *version; int length; @@ -767,7 +771,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) +