From patchwork Tue Feb 2 12:47:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 25343 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 5B3EC44A16B for ; Tue, 2 Feb 2021 14:47:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 319F2689D16; Tue, 2 Feb 2021 14:47:37 +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 C774D6807A6 for ; Tue, 2 Feb 2021 14:47:29 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id a16so779337plh.8 for ; Tue, 02 Feb 2021 04:47:29 -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=uFZdXyC/B6kScdP0zo6uSfI3o1OKGhu3Zu6/NqOhNFE=; b=DeIlvj26pRCuZQB/9fb3E+kcFr2PIJbBibzViTXqZzO10I8mIxh9ljSTazd09ex/kM gdKtX0SYbw5LdQb/H8DZURAwiHMrx4o8sos1tcp0UGkX/FvBpx2jJOein0rCcsv8wPFW vYdD8LBaqhSUjdZHUXbbW/jxEUWT56UPXrI7GZV3k0gbFbh5O1+Jjd8Y2TP+EpljxOb2 ZMdLKk39j03YW5u6VeUot1EeNHyhzhpOTvSZM/Q5+pvDuhjL07uN/521EcZFfEvU5kdk K2euccUFzgwbjC7hQWYhp2nJPAhuPjiX5w/4c4gdoPPm2oImrY9uDUDnPmRQfv8/yGEP QKEA== 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=uFZdXyC/B6kScdP0zo6uSfI3o1OKGhu3Zu6/NqOhNFE=; b=sr/ESpODyDE5vN8FMkb7Uux/SI8/sXOZpBruhdcdklMDKHk/9oS9MXiD982o83VAFt MGvBLQMsiU1GEGdolGGscxMN3YVK5zRU5FlgMfPKe3PDcEaEq8fsDq3oxxO0TMBSwwcY faqDzlmnvZ6bFTpBr6k0hiFvASd7Mpe2T01xcJ9d0bCRLGxsOhehROlUTkhFywF0kRSg 5yGjKQRXUR5w+cEY5lgx2+pxT5tAxfTmUUBtUoQL5LLM4p5kIalTiO7jlXJLKvOjzgxc Eko2dJKMt0QlZ1F5OFFcBI501AZF6fCprzIikyGjRbgaBeW9dbK5EZsmIm8aNYswOwfM fbkQ== X-Gm-Message-State: AOAM531QZvKIdfowRj1l64hUnghPRx2hmlto7xqShDfwHeWuwjI3U96v yodItQcgJcIGcQLTZQjzmPugbyMwcUw= X-Google-Smtp-Source: ABdhPJzx8iub83M6kMITG3DLH6BvZCssZtm7n1PYztQQCoGMsq2iZBosOgCH+tSVRuDa+PGT3CkvuA== X-Received: by 2002:a17:90a:d02:: with SMTP id t2mr4021254pja.130.1612270047849; Tue, 02 Feb 2021 04:47:27 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 24sm21250368pgt.14.2021.02.02.04.47.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Feb 2021 04:47:27 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Feb 2021 20:47:17 +0800 Message-Id: <1612270039-6379-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610168848-17933-3-git-send-email-lance.lmwang@gmail.com> References: <1610168848-17933-3-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 1/3] avformat/mxfdec: set toolkit version 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 Please check the string of toolkit version with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf .... toolkit_version : 58.65.101.0.0 Reviewed-by: Tomas Härdin Signed-off-by: Limin Wang --- libavformat/mxfdec.c | 24 ++++++++++++++++++++++++ tests/ref/fate/mxf-probe-applehdr10 | 1 + tests/ref/fate/mxf-probe-dnxhd | 1 + 3 files changed, 26 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 93fa7a9..18db056 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1978,6 +1978,15 @@ static int mxf_umid_to_str(UID ul, UID uid, char **str) return 0; } +static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t tertiary, + uint16_t patch, uint16_t release, char **str) +{ + *str = av_asprintf("%d.%d.%d.%d.%d", major, minor, tertiary, patch, release); + if (!*str) + return AVERROR(ENOMEM); + return 0; +} + static int mxf_add_umid_metadata(AVDictionary **pm, const char *key, MXFPackage* package) { char *str; @@ -2739,6 +2748,17 @@ static int64_t mxf_timestamp_to_int64(uint64_t timestamp) av_dict_set(&s->metadata, name, str, AV_DICT_DONT_STRDUP_VAL); \ } while (0) +#define SET_VERSION_METADATA(pb, name, major, minor, tertiary, patch, release, str) do { \ + major = avio_rb16(pb); \ + minor = avio_rb16(pb); \ + tertiary = avio_rb16(pb); \ + patch = avio_rb16(pb); \ + release = avio_rb16(pb); \ + if ((ret = mxf_version_to_str(major, minor, tertiary, patch, release, &str)) < 0) \ + return ret; \ + av_dict_set(&s->metadata, name, str, AV_DICT_DONT_STRDUP_VAL); \ +} while (0) + #define SET_UID_METADATA(pb, name, var, str) do { \ avio_read(pb, var, 16); \ if ((ret = mxf_uid_to_str(var, &str)) < 0) \ @@ -2760,6 +2780,7 @@ static int mxf_read_identification_metadata(void *arg, AVIOContext *pb, int tag, UID uid = { 0 }; char *str = NULL; uint64_t ts; + uint16_t major, minor, tertiary, patch, release; switch (tag) { case 0x3C01: SET_STR_METADATA(pb, "company_name", str); @@ -2776,6 +2797,9 @@ static int mxf_read_identification_metadata(void *arg, AVIOContext *pb, int tag, case 0x3C06: SET_TS_METADATA(pb, "modification_date", ts, str); break; + case 0x3C07: + SET_VERSION_METADATA(pb, "toolkit_version", major, minor, tertiary, patch, release, str); + break; case 0x3C08: SET_STR_METADATA(pb, "application_platform", str); break; diff --git a/tests/ref/fate/mxf-probe-applehdr10 b/tests/ref/fate/mxf-probe-applehdr10 index 53a767c..0bf9bf1 100644 --- a/tests/ref/fate/mxf-probe-applehdr10 +++ b/tests/ref/fate/mxf-probe-applehdr10 @@ -164,6 +164,7 @@ TAG:product_name=Compressor TAG:product_version=4.4.7 (4.4.7) TAG:product_uid=00000000-0000-0000-0000-000000000000 TAG:modification_date=2020-09-08T16:18:57.036000Z +TAG:toolkit_version=3.8.0.171.1 TAG:material_package_umid=0x060A2B340101010501010D201300000045843C9FE69D4B8FA90DDAAA1602A2E8 TAG:timecode=00:01:15;26 [/FORMAT] diff --git a/tests/ref/fate/mxf-probe-dnxhd b/tests/ref/fate/mxf-probe-dnxhd index 5a6221b..74d1831 100644 --- a/tests/ref/fate/mxf-probe-dnxhd +++ b/tests/ref/fate/mxf-probe-dnxhd @@ -173,6 +173,7 @@ TAG:project_name=UHD TAG:uid=784c8132-ae36-ed4d-b0ff-2edf1f3f2d92 TAG:generation_uid=b6bcfcab-70ff-7331-c47c-478869de11d2 TAG:application_platform=AAFSDK (MacOS X) +TAG:toolkit_version=1.1.0.0.0 TAG:modification_date=2016-09-18T19:25:25.000000Z TAG:product_uid=acfbf03a-4f42-a231-d0b7-c06ecd3d4ad7 TAG:product_version=Unknown version From patchwork Tue Feb 2 12:47:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 25345 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 51AC444B25E for ; Tue, 2 Feb 2021 15:16:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3853C688050; Tue, 2 Feb 2021 15:16:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3464F687F9A for ; Tue, 2 Feb 2021 15:16:12 +0200 (EET) Received: by mail-oi1-f172.google.com with SMTP id a77so22664416oii.4 for ; Tue, 02 Feb 2021 05:16:12 -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=x7++s8FMg8GOfXAQvStAgQz27JxKvVuz/QmAbt+Vj2k=; b=RqWWBCJdov3DDWl1i83B3+GpuAabmiubkSDXscOFGNbqeZGmpgjgZJrVg/zytGrhAT AvKR78oMZccifgp7MdoZ07CqjH2JFKb5kkhEQMlRsjE0ssnIzPbPm2j517y/wq2JFd7o H+mti4PsG/WbQJMa1jYNvsNv2DP2o5FBxGqT0ginKubdzPQfGumx2Mr7hx70+RbD8D5Q noikLKEXWqS9PtNxAbFsgdmNSuyPiw2EDemTs8B2COOIvDXSW2FHF6HW07GEJsQRLLHR G2tlwHX5MPmSwg2efFj3rKA1/d3OaM6BlYOBbgyTt5e+2ohuJ0Gm+zoeQktnBcvbKFkv 3pUg== 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=x7++s8FMg8GOfXAQvStAgQz27JxKvVuz/QmAbt+Vj2k=; b=brWme5A4QzDJF5kcR6TUgMN6tXReA+mo0/Segv4e6/Li7Afbuh2xk2Y/g01ZvL/01o LjMtSrPsRCKGt8DIwEyC81iTX/tuz3n5HthwsrJfxoXg2W7qu2JeaEpkC7AMAaXl1UKR RWbJXLlp3SpFX8qVuAnLWk0WW9ebDFNFq2CirWnYAGbcpL1R3Ihwh6PQwavg7FWJsFuA hJ3P5GteTDMwj64UwrOGrU4Ol5UOugHzldHI9zJnZSIKkuCj7uDUpsAbYNUNq6Oefsfc 6wuJSSVE+XNa+/GmWeW4BP8iHoUnjyYvKFN8qwT1eXpxBy3D70Bxkws9sZYkPsNYsbI9 SnNw== X-Gm-Message-State: AOAM531BSlCB2irLxpQfejnVAmWfk8YMANdxtdO1AADgV3M3AOg4WEtX 0lIxMBWVoohdUNTYjRcQQhosBE9AVIs= X-Google-Smtp-Source: ABdhPJxVqfR5yJAVJgz+ear3shvyBjuTWKZ0+iJQu3Ky6Sb6axR2vsrrPnWKa4EW5SVi+IJhhkbTuA== X-Received: by 2002:a17:90b:1093:: with SMTP id gj19mr2203518pjb.40.1612270049521; Tue, 02 Feb 2021 04:47:29 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 24sm21250368pgt.14.2021.02.02.04.47.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Feb 2021 04:47:28 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Feb 2021 20:47:18 +0800 Message-Id: <1612270039-6379-2-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 2/3] avformat/mxf: add platform local tag 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 Please check the string of platform with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf .... application_platform: Lavf (linux) Reviewed-by: Tomas Härdin Signed-off-by: Limin Wang --- configure | 1 + libavformat/mxfenc.c | 4 ++++ tests/ref/fate/copy-trac4914 | 2 +- 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 +- tests/ref/fate/time_base | 2 +- tests/ref/lavf/mxf | 6 +++--- tests/ref/lavf/mxf_d10 | 2 +- tests/ref/lavf/mxf_dv25 | 2 +- tests/ref/lavf/mxf_dvcpro50 | 2 +- tests/ref/lavf/mxf_opatom | 2 +- tests/ref/lavf/mxf_opatom_audio | 2 +- 14 files changed, 19 insertions(+), 14 deletions(-) diff --git a/configure b/configure index df298b4..a092a6b 100755 --- a/configure +++ b/configure @@ -7579,6 +7579,7 @@ cat > $TMPH <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 *platform = s->flags & AVFMT_FLAG_BITEXACT ? "Lavf" : PLATFROM_IDENT; const char *version; int length; @@ -768,6 +770,7 @@ static void mxf_write_identification(AVFormatContext *s) "0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION); length = 100 +mxf_utf16_local_tag_length(company) + mxf_utf16_local_tag_length(product) + + mxf_utf16_local_tag_length(platform) + mxf_utf16_local_tag_length(version); klv_encode_ber_length(pb, length); @@ -786,6 +789,7 @@ static void mxf_write_identification(AVFormatContext *s) store_version(s); mxf_write_local_tag_utf16(s, 0x3C04, version); // Version String + mxf_write_local_tag_utf16(s, 0x3C08, platform); // Platform // write product uid mxf_write_local_tag(s, 16, 0x3C05); diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index e8f8afb..743dc8c 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,4 +1,4 @@ -5d58a32f21b78169d925845f783054e6 *tests/data/fate/copy-trac4914.mxf +f5150fb82c1bb5a90906fce93dcc3f76 *tests/data/fate/copy-trac4914.mxf 561721 tests/data/fate/copy-trac4914.mxf #tb 0: 1001/30000 #media_type 0: video diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index 3b9d9d2..c35add0 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1 +1 @@ -fe9b43f5b6e7737fe2670b660fd3d860 +7bb9f39e8e05724525154de17f0235d8 diff --git a/tests/ref/fate/mxf-opatom-user-comments b/tests/ref/fate/mxf-opatom-user-comments index be57eb4..ec4fdff 100644 --- a/tests/ref/fate/mxf-opatom-user-comments +++ b/tests/ref/fate/mxf-opatom-user-comments @@ -1 +1 @@ -9b3d7201c37c5783702774e46e0da141 +8475bebf3448a972ae89ba59309fd7d6 diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index acda8fe..d50f0f6 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -422d6ed4821e7bbecbcdecc553abc6e4 +ce49a0361d3f79106e1952d387eace51 diff --git a/tests/ref/fate/mxf-user-comments b/tests/ref/fate/mxf-user-comments index 3b77db9..5fcdc58 100644 --- a/tests/ref/fate/mxf-user-comments +++ b/tests/ref/fate/mxf-user-comments @@ -1 +1 @@ -c77b632dbcdacd6466e1ec794917556e +956f653cd75e1a319569caec9df81b4f diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index d3c9795..28815d0 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -e5c9da6972b6f6e7b15bcbbf20a9dbd1 +78ac0348027b75d73acb8bea14e67a59 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 1b1fe1a..21bf2be 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -1703da2e9f0ca49a5f0bcbcc6944c9c0 *tests/data/lavf/lavf.mxf +8938d5c4a396ff1b24d10d4f917ae1c9 *tests/data/lavf/lavf.mxf 526393 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x8dddfaab -b44c4f138f1a87256211c3112dd52c87 *tests/data/lavf/lavf.mxf +93ea2cfdf5dda7fffdc0d2fdcfb6a9a4 *tests/data/lavf/lavf.mxf 561721 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x96ff1b48 -9ede3c95054c30eb815fbe598a1f097b *tests/data/lavf/lavf.mxf +87bdf844ae34bcc758e44419e80177a0 *tests/data/lavf/lavf.mxf 526393 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x8dddfaab diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index 19e6f20..47ef244 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -c72f1f3d6ce555f96946c421f705f880 *tests/data/lavf/lavf.mxf_d10 +7f16902e28718c2a92bc082400a1c6ee *tests/data/lavf/lavf.mxf_d10 5332013 tests/data/lavf/lavf.mxf_d10 tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488 diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 index 2951538..92509cf 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -5048796729fba47e9614a177c370e850 *tests/data/lavf/lavf.mxf_dv25 +106e33eb1634595623f0334e92204b65 *tests/data/lavf/lavf.mxf_dv25 3834413 tests/data/lavf/lavf.mxf_dv25 tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52 diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50 index 9df2fc9..2d569b0 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -7023122fc4bcd5c12de6a33cc78ce9b8 *tests/data/lavf/lavf.mxf_dvcpro50 +3d5a303c22666996700f0e8f6e4cb938 *tests/data/lavf/lavf.mxf_dvcpro50 7431213 tests/data/lavf/lavf.mxf_dvcpro50 tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index bff36e0..61e7555 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -8a4c5680b0955d4e2abecfb1c37a56d4 *tests/data/lavf/lavf.mxf_opatom +5d235c127ace64b1f4fe6c79a7ca8be6 *tests/data/lavf/lavf.mxf_opatom 4717625 tests/data/lavf/lavf.mxf_opatom tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio index 5c65a37..97362e7 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -697f4eb4a472909945222d7750145f80 *tests/data/lavf/lavf.mxf_opatom_audio +c356a3fdd49a1e015961678e837c12bb *tests/data/lavf/lavf.mxf_opatom_audio 102969 tests/data/lavf/lavf.mxf_opatom_audio tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff 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) +