From patchwork Sat Jan 9 05:07:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24850 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 0B35D44BAA0 for ; Sat, 9 Jan 2021 07:08:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E731A68A5CC; Sat, 9 Jan 2021 07:08:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0DD568A57E for ; Sat, 9 Jan 2021 07:08:21 +0200 (EET) Received: by mail-pj1-f49.google.com with SMTP id n3so6423102pjm.1 for ; Fri, 08 Jan 2021 21:08:21 -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=EOq4oWykskhuMIV+xgFkevWuxeHefIuMw2xmHh4lcVE=; b=kz197To2pjXdZTSNAc+3hW6cmOrX7BpuqqZVoJtyZ0WBWFv/qys1QLao01EDgM/AJI MKtipIuj8UKGJiFMzeP+PdUCcFAysX1Ppeh3pcma0o9KOwCOTntkNGuRVGsP/zNGLvjp FD2p6xPEoUW5BWO26/K4cf9pd6gpn+aG7xr5/+QntyE23ivGpRHQ/5eoEx/Xjx5ZcOsf +XGVz520bfsZy0aMvvWkS8UJDxshmuGI8Un1egonRpMgAfGIibdQYKO0AJQKLZc5sPOI rSJAgB+b1eHNFmzW6f2HewdaB8CCwTBtOLCIs8kg2F4kw2TpVCfWqxySMONHAAwGd87F t3OA== 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=EOq4oWykskhuMIV+xgFkevWuxeHefIuMw2xmHh4lcVE=; b=PT9YxX03k08R6xwdRLrtvavYLgH54S7cG2gheiBVXC+ffrdeh01s5KoiqGM+mvJFGX EI5416HsgfZ0o216p0hloJy67MfZhft05QWaEZNIPX2EyND+FPcxePChol7YBwPJHgy9 dkW1j4nxmIrU8g2pRBt17QqLXYA36Wz4R7kB/PaD85NT1VGic8c8G6rlGVQZcnAx6aV4 aVY88kw6W90luEbjwyai8jZyJewoJl9DUBtvoOjpEWUFP/y6LUdTylarkJ2PGzR+iRBC goE+mlFJxh1zIPTRoI9klDdnjHAH9Tlz7qGd/iNsUISQ8RQ79/VCi1PcBOGRxGAZN2sV CflQ== X-Gm-Message-State: AOAM533K3OyBEYuGLT2EmnHgfY14OlGbyp8pk3jF3PwNCg/4VqGhndas JX/8+AUJxqPX3J3cbE60f72s10KLS68= X-Google-Smtp-Source: ABdhPJwX+s/ouoJDsmE7LD+O3wJhfV4EeWGWBdSNdD9qlgJmKuf9dfXyA76CHqePyr0v9HrkQpVMGQ== X-Received: by 2002:a17:902:302:b029:db:fa52:2dd2 with SMTP id 2-20020a1709020302b02900dbfa522dd2mr7188852pld.62.1610168899823; Fri, 08 Jan 2021 21:08:19 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 8sm10819864pfz.93.2021.01.08.21.08.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 21:08:19 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Jan 2021 13:07:28 +0800 Message-Id: <1610168848-17933-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> References: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 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 c295514..493763b 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2650,6 +2650,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 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);