diff mbox series

[FFmpeg-devel,2/2] avformat/mxfdec: add support for getting product version number metadata

Message ID 20210219231800.19205-2-cus@passwd.hu
State Accepted
Commit 088f35f0364b3a1881f40c4ea097763c46b7d886
Headers show
Series [FFmpeg-devel,1/2] avformat/mxfdec: change toolkit_version metadata field to toolkit_version_num
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Marton Balint Feb. 19, 2021, 11:18 p.m. UTC
Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/mxfdec.c                 | 3 +++
 tests/ref/fate/mxf-d10-user-comments | 1 +
 tests/ref/fate/mxf-probe-dnxhd       | 1 +
 3 files changed, 5 insertions(+)

Comments

Marton Balint Feb. 27, 2021, 8:57 p.m. UTC | #1
On Sat, 20 Feb 2021, Marton Balint wrote:

> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavformat/mxfdec.c                 | 3 +++
> tests/ref/fate/mxf-d10-user-comments | 1 +
> tests/ref/fate/mxf-probe-dnxhd       | 1 +
> 3 files changed, 5 insertions(+)

Ping, will apply soon.

Thanks,
Marton

>
> 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
> -- 
> 2.26.2
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

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