From patchwork Sun Jan 31 23:50:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 25310 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 9407D448B48 for ; Mon, 1 Feb 2021 01:51:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6ECE6689A02; Mon, 1 Feb 2021 01:51:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1051668924E for ; Mon, 1 Feb 2021 01:51:03 +0200 (EET) Received: by mail-pf1-f170.google.com with SMTP id b145so3609905pfb.4 for ; Sun, 31 Jan 2021 15:51:02 -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=iO6AILb7oLWf/PhONufIZK6tz1GoWkXlyOVDGhS+kEE=; b=hcyvM+l+FuxN5vuJg/7Fk/L2pDGsaY+3K2bf1gWvnk/pliqk0c8Vr3AE41YTr5Qr/t 8ThMC9gn8xbicAXW9B34ylUeQ7MctgG4CvTBufYQLME0stM8LDiBLnFyoYj4NdX+85zt ViOWYjEyOfETCfd3gAtScmzJbx235ywZC9O/3uhhF0XMHzs8PDZ89pMRynZjnzkS/ALr 7z9JZLU1+FQtkXGJMcyr4zmJEBkUrvW46/3YDaFxPQLwmjHDyYpmTxQ4YT9N9dYDTOCr MRCv8/Z6IIPv9XOX71Jw2MBnGREH28xYMCErstX00Q77om2r0lzi6qBEE/42s1TBBjVU yneg== 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=iO6AILb7oLWf/PhONufIZK6tz1GoWkXlyOVDGhS+kEE=; b=FWQZN3c9/vCyaQ5dNLcu8ZU3UhGVvy6JnX/C9+rCEZzpcD52s+4UQGi7GpWFXFknUh xviuAEAL1i2hHpW3qkGmBIEoQ4XRGqvmvHKz/Zbbh9DTAoel5QhzzCTCCE7X+X0ajC0r XGVzaadcSsKIrOgltZG8bfjLfwRR7/1U2PIiTjSpdnDkZUyYRoWuEl2znRcdgIk2vlHA 02kd/OK79V6DyQKfFsojJMTWQhcm9+cpjb5kVkl4VmV+O1Pj85gznTeZK0fiYug0bCSC /ur5D45N3RkNZVCeGw76p3/3uLisE3VNJyF2OqzTC8jEQQy649LWK7NESh/kpBsk3FrA iwOg== X-Gm-Message-State: AOAM531Lt7aJbWopMq6eIard9PI+XNTYzmL9gZowCxRMc052tNgLEaFz IsJjVXE0pLUMFSA4lOF2LddXwP8LY4o= X-Google-Smtp-Source: ABdhPJzxB1vLYsi3gy6ukUizB9o5tbs67+KUyRVJsLqDRIM4pG2mwmkVRncKkYiEeTQkpN0I05duoA== X-Received: by 2002:a63:48b:: with SMTP id 133mr14252980pge.139.1612137060819; Sun, 31 Jan 2021 15:51:00 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e20sm15704444pgr.48.2021.01.31.15.50.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Jan 2021 15:51:00 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Feb 2021 07:50:53 +0800 Message-Id: <1612137055-19114-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> Subject: [FFmpeg-devel] [PATCH v6 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 MIME-Version: 1.0 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 Signed-off-by: Limin Wang --- libavformat/mxfdec.c | 25 +++++++++++++++++++++++++ tests/ref/fate/mxf-probe-applehdr10 | 1 + tests/ref/fate/mxf-probe-dnxhd | 1 + 3 files changed, 27 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index afff204..61c8104 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1970,6 +1970,18 @@ 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, char **str) +{ + int size = sizeof(major) * 5 + 1; + + *str = av_mallocz(size); + if (!*str) + return AVERROR(ENOMEM); + + snprintf(*str, size, "%d.%d.%d", major, minor, tertiary); + return 0; +} + static int mxf_add_umid_metadata(AVDictionary **pm, const char *key, MXFPackage* package) { char *str; @@ -2731,6 +2743,15 @@ 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, str) do { \ + major = avio_rb16(pb); \ + minor = avio_rb16(pb); \ + tertiary = avio_rb16(pb); \ + if ((ret = mxf_version_to_str(major, minor, tertiary, &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) \ @@ -2752,6 +2773,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; switch (tag) { case 0x3C01: SET_STR_METADATA(pb, "company_name", str); @@ -2768,6 +2790,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, 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..924850b 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 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..dad6417 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 TAG:modification_date=2016-09-18T19:25:25.000000Z TAG:product_uid=acfbf03a-4f42-a231-d0b7-c06ecd3d4ad7 TAG:product_version=Unknown version From patchwork Sun Jan 31 23:50:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 25311 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 C08BD448B48 for ; Mon, 1 Feb 2021 01:51:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7DA5689C22; Mon, 1 Feb 2021 01:51:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80C2C689B91 for ; Mon, 1 Feb 2021 01:51:04 +0200 (EET) Received: by mail-pg1-f179.google.com with SMTP id b21so10811769pgk.7 for ; Sun, 31 Jan 2021 15:51:04 -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=d9D9xhn5xe6uRWuqWFubBJYfuWHoK1AUHy34fDzeius=; b=Xf3Hz8plCuA//duC6EFK7TdYlE34SXgpvg4KjFrMx1NhJD8CCNlknIm7MHtpWqnj4o NdlCoQ7PcZegxFr19bNzW0WZLuJfJJc3wqg9C/qMxf4vm1vUF6xmjWtDBxw1JkuH1V4H We2f4Y7SrACVHQeChYkGEQ98XQ5PtbZntM/AU3iOaIMgCrzfacQCIkqwWvtnN6kZamuz 96I7SP7mxX99fyrQOGtcGxReEL8Sd6292YpInbEU23h5GoTUF1rIxVc9aOUqN2Q/zHDu tKqhH7nHNgSWz7SXExT+A4BPdtWjxQZk5R5SdQQAwrE4t9+s2+1UcRKLlXtRwIlKh0II vv0w== 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=d9D9xhn5xe6uRWuqWFubBJYfuWHoK1AUHy34fDzeius=; b=V3BnsJ10r/De+FKut6JdM17JZhtnkk9Ply2MZhvGtwkj/i/WwfYzaHpL4fxPGxl58m Y+OqqGULof82gfhdOKcGR3+Vkj4/STPtpxrGmfoEwhH6CmxXVojxio4uqSi5Nw6H41yS AaZ8OSlpcyU5M6BIgHRtK5JJL0Dj5tPrPkW+zdjdkB1CQ8/weoHyNFeb+lCZIvzzi8aG NbGgJskXblbY4pzC15Y4b5YEK+gt+sSJI3sMEkNV/ZY5YRyxDvgQZ3s8sK3gp5VSlBQk pn8lpSeVOrN4kefzI9sJZUIKDBRw+OciYuyk/2nMR7RKkKgduWHpoh1FAA3DOoqDp9PG W6IA== X-Gm-Message-State: AOAM530wgtVUU2RuWchaA255gwZfA4vvZWjaA1gRYTXXq3E4ZjAd2gsW pjh48EI5acmdrl/oGouHIUlJEESgBnE= X-Google-Smtp-Source: ABdhPJzVWYw3aIJijW0M818xfA4q9C4uFqRVX68sWkRE4og+7ZgmIVVQsKhtkuOLa+1kPsjUxUIPbw== X-Received: by 2002:a63:e5e:: with SMTP id 30mr14800278pgo.181.1612137062519; Sun, 31 Jan 2021 15:51:02 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e20sm15704444pgr.48.2021.01.31.15.51.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Jan 2021 15:51:01 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Feb 2021 07:50:54 +0800 Message-Id: <1612137055-19114-2-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 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 MIME-Version: 1.0 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) 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; @@ -726,6 +727,7 @@ static void mxf_write_identification(AVFormatContext *s) const char *company = "FFmpeg"; const char *product = s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer"; const char *version; + const char *platform = s->flags & AVFMT_FLAG_BITEXACT ? "Lavf" : PLATFROM_IDENT; int length; mxf_write_metadata_key(pb, 0x013000); @@ -735,6 +737,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); @@ -753,6 +756,7 @@ static void mxf_write_identification(AVFormatContext *s) store_version(s); mxf_write_local_tag_utf16(pb, 0x3C04, version); // Version String + mxf_write_local_tag_utf16(pb, 0x3C08, platform); // Platform // write product uid mxf_write_local_tag(pb, 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 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) +