Merge pull request #1559 from g-maxime/preparing-v22.06

Preparing v22.06
MediaArea · Jun 23, 2022 · 6f528af · 6f528af
2 parents b7a672f + 3e525a2
commit 6f528af
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 63 deletions.
diff --git a/History_DLL.txt b/History_DLL.txt
@@ -7,6 +7,28 @@ x Correction
 bug reports and feature request are here:
 https://sourceforge.net/p/mediainfo/_list/tickets
 
+Version 22.06, 2022-06-23
+-------------
++ MXF: FFV1 support
++ Dolby Vision: add info about more profiles
++ AAC: check of missing ID_END and incoherent count of channels
++ NSV: better handling of buggy StarDiva agenda negative timestamps
++ Text: Show text frame rate
++ Text: frame rate precise numerator/denominator also for text streams
++ CDP: readout of display aspect ratio
++ MPEG-4/MOV: support of time codes >30 fps
++ TTML: Support of more timeExpression flavors
+x ADM: correctly map Dolby binaural render mode to track UID
+x Dolby Audio Metadata: first frame of action in HH:MM:SS:FF format
+x Dolby Vision: profiles and levels in decimal rather than in hexadecimal
+x MXF: fix of Dolby Vision Metadata not displayed if HDR10 metadata is present
+x MPEG-4/MOV: avoid buggy frame rates by taking frame rate from stts atom
+x CDP: better catching of wrong line21_field value
+x NSV: better handling of invalid frames
+x MXF: Include frame count in SDTI and SystemScheme1 time codes to time stamp conversion
+x TTML: do not show frame rate if it is from MediaInfo options
+x DV: timecode trace in HH:MM:SS:FF format
+
 Version 22.03, 2022-03-31
 -------------
 + NSV (Nullsoft Video): full featured support

diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
@@ -5,7 +5,7 @@ project(MediaInfoLib)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 
 set(MediaInfoLib_MAJOR_VERSION 22)
-set(MediaInfoLib_MINOR_VERSION 03)
+set(MediaInfoLib_MINOR_VERSION 06)
 set(MediaInfoLib_PATCH_VERSION 0)
 set(MediaInfoLib_VERSION ${MediaInfoLib_MAJOR_VERSION}.${MediaInfoLib_MINOR_VERSION})
 

diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
@@ -5,7 +5,7 @@ dnl #########################################################################
 dnl -------------------------------------------------------------------------
 dnl Name and version
 dnl
-AC_INIT([libmediainfo], [22.03])
+AC_INIT([libmediainfo], [22.06])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place

diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: hydro <[email protected]>
 
 pkgname=('libmediainfo' 'python2-mediainfo' 'python-mediainfo')
-pkgver=22.03
+pkgver=22.06
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64')

diff --git a/Project/GNU/libmediainfo.dsc b/Project/GNU/libmediainfo.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0-dbg
 Architecture: any all
-Version: 22.03-1
+Version: 22.06-1
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
@@ -16,11 +16,11 @@ Package-List:
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_22.03-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.06.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.06-1.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.06.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.06-1.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_22.03-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.06.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.06-1.debian.tar.xz
diff --git a/Project/GNU/libmediainfo.spec b/Project/GNU/libmediainfo.spec
@@ -1,6 +1,6 @@
-%global libmediainfo_version      22.03
+%global libmediainfo_version      22.06
 %global libmediainfo_version_major      22
-%global libmediainfo_version_minor      03
+%global libmediainfo_version_minor      06
 %global libzen_version            0.4.39
 %global libzen_version_major      0
 %global libzen_version_minor      4
@@ -411,7 +411,7 @@ rm -f %{buildroot}%{_libdir}/%{name_without_0_ending}.la
 %endif
 
 %changelog
-* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 22.03-0
+* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 22.06-0
 - See History.txt for more info and real dates
 - Previous packages made by Toni Graffy <[email protected]>
 - Fedora style made by Vasiliy N. Glazov <[email protected]>
diff --git a/Project/MSVC2013/Example/HowToUse.rc b/Project/MSVC2013/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/Example/HowToUse.rc b/Project/MSVC2015/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/Example/HowToUse.rc b/Project/MSVC2017/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2019/Example/HowToUse.rc b/Project/MSVC2019/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2019/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2019/ShellExtension/MediaInfoShellExt.rc
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/OBS/deb9.debian/changelog b/Project/OBS/deb9.debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (22.03-1) experimental; urgency=medium
+libmediainfo (22.06-1) experimental; urgency=medium
 
-  * Upstream version 22.03
+  * Upstream version 22.06
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <[email protected]>  Mon, 02 Nov 2015 10:30:00 +0100

diff --git a/Project/OBS/deb9.dsc b/Project/OBS/deb9.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0v5, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0v5-dbg
 Architecture: any all
-Version: 22.03-1deb9
+Version: 22.06-1deb9
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
@@ -16,11 +16,11 @@ Package-List:
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_22.03-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.06.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.06-1deb9.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.06.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.06-1deb9.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_22.03-1deb9.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.06.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.06-1deb9.debian.tar.xz
diff --git a/Project/Solaris/mkpkg b/Project/Solaris/mkpkg
@@ -9,7 +9,7 @@ release=`uname -r`
 
 #Creation of known directories and filenames
 name="libmediainfo0"
-version="22.03"
+version="22.06"
 Home=`pwd`
 install_prefix=${Home}/mk_package
 packagecreation_prefix=${Home}/create_package

diff --git a/Project/version.txt b/Project/version.txt
@@ -1 +1 @@
-22.03
+22.06
diff --git a/Source/Install/MediaInfo_DLL_Windows_i386.nsi b/Source/Install/MediaInfo_DLL_Windows_i386.nsi
@@ -4,7 +4,7 @@ RequestExecutionLevel admin
 ; Some defines
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "22.03"
+!define PRODUCT_VERSION "22.06"
 !define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0"
 !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"
 !define COMPANY_REGISTRY "Software\MediaArea.net"

diff --git a/Source/Install/MediaInfo_DLL_Windows_x64.nsi b/Source/Install/MediaInfo_DLL_Windows_x64.nsi
@@ -4,7 +4,7 @@ RequestExecutionLevel admin
 ; Some defines
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "22.03"
+!define PRODUCT_VERSION "22.06"
 !define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0"
 !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"
 !define COMPANY_REGISTRY "Software\MediaArea.net"

diff --git a/Source/MediaInfo/MediaInfo_Config.cpp b/Source/MediaInfo/MediaInfo_Config.cpp
@@ -136,7 +136,7 @@ namespace MediaInfoLib
 {
 
 //---------------------------------------------------------------------------
-const Char*  MediaInfo_Version=__T("MediaInfoLib - v22.03");
+const Char*  MediaInfo_Version=__T("MediaInfoLib - v22.06");
 const Char*  MediaInfo_Url=__T("http://MediaArea.net/MediaInfo");
       Ztring EmptyZtring;       //Use it when we can't return a reference to a true Ztring
 const Ztring EmptyZtring_Const; //Use it when we can't return a reference to a true Ztring, const version

diff --git a/Source/MediaInfoDLL/MediaInfoDLL.rc b/Source/MediaInfoDLL/MediaInfoDLL.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,03,0,0
- PRODUCTVERSION 22,03,0,0
+ FILEVERSION 22,06,0,0
+ PRODUCTVERSION 22,06,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "22.03.0.0"
+            VALUE "FileVersion", "22.06.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "22.03.0.0"
+            VALUE "ProductVersion", "22.06.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (22.03-1) experimental; urgency=medium
+libmediainfo (22.06-1) experimental; urgency=medium
 
-  * Upstream version 22.03
+  * Upstream version 22.06
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <[email protected]>  Mon, 02 Nov 2015 10:30:00 +0100