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