From patchwork Fri Feb 19 23:17:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 25820 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 10BC844A5D2 for ; Sat, 20 Feb 2021 01:18:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDDDA68A995; Sat, 20 Feb 2021 01:18:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8722F68A3B7 for ; Sat, 20 Feb 2021 01:18:32 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5D95AE5024; Sat, 20 Feb 2021 00:18:32 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OTynXalQrllR; Sat, 20 Feb 2021 00:18:02 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1D0B6E4FF3; Sat, 20 Feb 2021 00:18:02 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Feb 2021 00:17:59 +0100 Message-Id: <20210219231800.19205-1-cus@passwd.hu> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: change toolkit_version metadata field to toolkit_version_num 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It only got added recently, and the new name makes it consistent with product_version_num in the next patch. Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 2 +- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/mxf-probe-applehdr10 | 2 +- tests/ref/fate/mxf-probe-dnxhd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 9f22c386f0..3ce83dde54 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2798,7 +2798,7 @@ static int mxf_read_identification_metadata(void *arg, AVIOContext *pb, int tag, SET_TS_METADATA(pb, "modification_date", ts, str); break; case 0x3C07: - SET_VERSION_METADATA(pb, "toolkit_version", major, minor, tertiary, patch, release, str); + SET_VERSION_METADATA(pb, "toolkit_version_num", major, minor, tertiary, patch, release, str); break; case 0x3C08: SET_STR_METADATA(pb, "application_platform", str); diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index 0dcb04de30..69605d1906 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -20,7 +20,7 @@ TAG:product_name=FATE-test TAG:product_version=3.14159 TAG:application_platform=Lavf TAG:product_uid=adab4424-2f25-4dc7-92ff-29bd000c0002 -TAG:toolkit_version=0.0.0.0.0 +TAG:toolkit_version_num=0.0.0.0.0 TAG:material_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000000 TAG:comment_test=value TAG:timecode=01:00:00:00 diff --git a/tests/ref/fate/mxf-probe-applehdr10 b/tests/ref/fate/mxf-probe-applehdr10 index 0bf9bf1b63..dd928ef8c5 100644 --- a/tests/ref/fate/mxf-probe-applehdr10 +++ b/tests/ref/fate/mxf-probe-applehdr10 @@ -164,7 +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:toolkit_version_num=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 74d1831f16..8b1add0374 100644 --- a/tests/ref/fate/mxf-probe-dnxhd +++ b/tests/ref/fate/mxf-probe-dnxhd @@ -173,7 +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:toolkit_version_num=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 Fri Feb 19 23:18:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 25821 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 2190A44A5D2 for ; Sat, 20 Feb 2021 01:18:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04C4068A9CE; Sat, 20 Feb 2021 01:18:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3B7968A9A1 for ; Sat, 20 Feb 2021 01:18:34 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id D8127E4FF3; Sat, 20 Feb 2021 00:18:34 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4RgZew-TZ92v; Sat, 20 Feb 2021 00:18:05 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id C06D3E500D; Sat, 20 Feb 2021 00:18:04 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Feb 2021 00:18:00 +0100 Message-Id: <20210219231800.19205-2-cus@passwd.hu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210219231800.19205-1-cus@passwd.hu> References: <20210219231800.19205-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mxfdec: add support for getting product version number 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 3 +++ tests/ref/fate/mxf-d10-user-comments | 1 + tests/ref/fate/mxf-probe-dnxhd | 1 + 3 files changed, 5 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 3ce83dde54..bb00838a3f 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2788,6 +2788,9 @@ static int mxf_read_identification_metadata(void *arg, AVIOContext *pb, int tag, case 0x3C02: SET_STR_METADATA(pb, "product_name", str); break; + case 0x3C03: + SET_VERSION_METADATA(pb, "product_version_num", major, minor, tertiary, patch, release, str); + break; case 0x3C04: SET_STR_METADATA(pb, "product_version", str); break; diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index 69605d1906..13761fb0ce 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -17,6 +17,7 @@ TAG:uid=adab4424-2f25-4dc7-92ff-29bd000c0000 TAG:generation_uid=adab4424-2f25-4dc7-92ff-29bd000c0001 TAG:company_name=FATE-company TAG:product_name=FATE-test +TAG:product_version_num=0.0.0.0.0 TAG:product_version=3.14159 TAG:application_platform=Lavf TAG:product_uid=adab4424-2f25-4dc7-92ff-29bd000c0002 diff --git a/tests/ref/fate/mxf-probe-dnxhd b/tests/ref/fate/mxf-probe-dnxhd index 8b1add0374..274dcc47d9 100644 --- a/tests/ref/fate/mxf-probe-dnxhd +++ b/tests/ref/fate/mxf-probe-dnxhd @@ -177,6 +177,7 @@ TAG:toolkit_version_num=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 +TAG:product_version_num=8.6.0.0.1 TAG:product_name=Avid Media Composer 8.6.3.43955 TAG:company_name=Avid Technology, Inc. TAG:material_package_umid=0x060A2B340101010101010F001300000057DEEA1570665313060E2B347F7F2A80