Skip to content

Move T35 parsing code to its own parser #2541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JeromeMartinez wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Move T35 parsing code to its own parser #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Project/CMake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ set(MediaInfoLib_SRCS
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_SequenceInfo.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_Skm.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_Swf.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_T35.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_Umf.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_Vbi.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Multiple/File_Wm.cpp
Expand Down
1 change: 1 addition & 0 deletions Project/GNU/Library/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
../../../Source/MediaInfo/Multiple/File_SequenceInfo.cpp \
../../../Source/MediaInfo/Multiple/File_Skm.cpp \
../../../Source/MediaInfo/Multiple/File_Swf.cpp \
../../../Source/MediaInfo/Multiple/File_T35.cpp \
../../../Source/MediaInfo/Multiple/File_Umf.cpp \
../../../Source/MediaInfo/Multiple/File_Vbi.cpp \
../../../Source/MediaInfo/Multiple/File_Wm.cpp \
Expand Down
3 changes: 3 additions & 0 deletions Project/GNU/Library/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ AC_ARG_ENABLE(riff, AC_HELP_STRING([--disable-riff], [Disable Multiple - R
AC_ARG_ENABLE(rm, AC_HELP_STRING([--disable-rm], [Disable Multiple - Real Media]), MediaInfoRm=$enableval, MediaInfoRm=depend)
AC_ARG_ENABLE(skm, AC_HELP_STRING([--disable-skm], [Disable Multiple - SKM]), MediaInfoSkm=$enableval, MediaInfoSkm=depend)
AC_ARG_ENABLE(swf, AC_HELP_STRING([--disable-swf], [Disable Multiple - Shockwave]), MediaInfoSwf=$enableval, MediaInfoSwf=depend)
AC_ARG_ENABLE(t35, AC_HELP_STRING([--disable-t35], [Disable Multiple - ITU-T T35]), MediaInfoT35=$enableval, MediaInfoT35=depend)
AC_ARG_ENABLE(tsp, AC_HELP_STRING([--disable-tsp], [Disable Multiple - TSP]), MediaInfoTsp=$enableval, MediaInfoTsp=depend)
AC_ARG_ENABLE(wm, AC_HELP_STRING([--disable-wm], [Disable Multiple - Windows Media (ASF, WMV, WMA)]), MediaInfoWm=$enableval, MediaInfoWm=depend)
AC_ARG_ENABLE(apetag, AC_HELP_STRING([--disable-apetag], [Disable Tag - ApeTag]), MediaInfoApeTag=$enableval, MediaInfoApeTag=depend)
Expand Down Expand Up @@ -345,6 +346,7 @@ if test "$MediaInfoRiff" = "no"; then AC_DEFINE(MEDIAINFO_RIFF_NO) fi; if
if test "$MediaInfoRm" = "no"; then AC_DEFINE(MEDIAINFO_RM_NO) fi; if test "$MediaInfoRm" = "yes"; then AC_DEFINE(MEDIAINFO_RM_YES) fi
if test "$MediaInfoSkm" = "no"; then AC_DEFINE(MEDIAINFO_SKM_NO) fi; if test "$MediaInfoSkm" = "yes"; then AC_DEFINE(MEDIAINFO_SKM_YES) fi
if test "$MediaInfoSwf" = "no"; then AC_DEFINE(MEDIAINFO_SWF_NO) fi; if test "$MediaInfoSwf" = "yes"; then AC_DEFINE(MEDIAINFO_SWF_YES) fi
if test "$MediaInfoT35" = "no"; then AC_DEFINE(MEDIAINFO_T35_NO) fi; if test "$MediaInfot35" = "yes"; then AC_DEFINE(MEDIAINFO_T35_YES) fi
if test "$MediaInfoTsp" = "no"; then AC_DEFINE(MEDIAINFO_TSP_NO) fi; if test "$MediaInfoTsp" = "yes"; then AC_DEFINE(MEDIAINFO_TSP_YES) fi
if test "$MediaInfoWm" = "no"; then AC_DEFINE(MEDIAINFO_WM_NO) fi; if test "$MediaInfoWm" = "yes"; then AC_DEFINE(MEDIAINFO_WM_YES) fi
if test "$MediaInfoApeTag" = "no"; then AC_DEFINE(MEDIAINFO_APETAG_NO) fi; if test "$MediaInfoApeTag" = "yes"; then AC_DEFINE(MEDIAINFO_APETAG_YES) fi
Expand Down Expand Up @@ -1121,6 +1123,7 @@ Mcho "Riff " "$MediaInfoRiff"
Mcho "Rm " "$MediaInfoRm"
Mcho "Skm " "$MediaInfoSkm"
Mcho "Swf " "$MediaInfoSwf"
Mcho "T35 " "$MediaInfot35"
Mcho "Tsp " "$MediaInfoTsp"
Mcho "Wm " "$MediaInfoWm"
Mcho "ApeTag " "$MediaInfoApeTag"
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2022/Library/MediaInfoLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Pmp.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ptx.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_T35.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Vbi.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Wtv.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.cpp" />
Expand Down Expand Up @@ -830,6 +831,7 @@
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Pmp.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ptx.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_T35.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Vbi.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Wtv.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.h" />
Expand Down
6 changes: 6 additions & 0 deletions Project/MSVC2022/Library/MediaInfoLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,9 @@
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av2.cpp">
<Filter>Source Files\Video</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_T35.cpp">
<Filter>Source Files\Multiple</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Source\MediaInfo\File__Analyse_Automatic.h">
Expand Down Expand Up @@ -1672,5 +1675,8 @@
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av2.h">
<Filter>Header Files\Video</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_T35.h">
<Filter>Header Files\Multiple</Filter>
</ClInclude>
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Project/MSVC2026/Library/MediaInfoLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Pmp.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ptx.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_T35.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Vbi.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Wtv.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.cpp" />
Expand Down Expand Up @@ -830,6 +831,7 @@
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Pmp.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ptx.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_T35.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Vbi.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Wtv.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.h" />
Expand Down
6 changes: 6 additions & 0 deletions Project/MSVC2026/Library/MediaInfoLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,9 @@
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av2.cpp">
<Filter>Source Files\Video</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_T35.cpp">
<Filter>Source Files\Multiple</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Source\MediaInfo\File__Analyse_Automatic.h">
Expand Down Expand Up @@ -1672,5 +1675,8 @@
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av2.h">
<Filter>Header Files\Video</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_T35.h">
<Filter>Header Files\Multiple</Filter>
</ClInclude>
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Project/Qt/MediaInfoLib.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ HEADERS += \
../../Source/MediaInfo/Multiple/File_SequenceInfo.h \
../../Source/MediaInfo/Multiple/File_Skm.h \
../../Source/MediaInfo/Multiple/File_Swf.h \
../../Source/MediaInfo/Multiple/File_T35.h \
../../Source/MediaInfo/Multiple/File_Umf.h \
../../Source/MediaInfo/Multiple/File_Vbi.h \
../../Source/MediaInfo/Multiple/File_Wm.h \
Expand Down Expand Up @@ -446,6 +447,7 @@ SOURCES += \
../../Source/MediaInfo/Multiple/File_SequenceInfo.cpp \
../../Source/MediaInfo/Multiple/File_Skm.cpp \
../../Source/MediaInfo/Multiple/File_Swf.cpp \
../../Source/MediaInfo/Multiple/File_T35.cpp \
../../Source/MediaInfo/Multiple/File_Umf.cpp \
../../Source/MediaInfo/Multiple/File_Vbi.cpp \
../../Source/MediaInfo/Multiple/File_Wm.cpp \
Expand Down
1 change: 0 additions & 1 deletion Source/MediaInfo/Audio/File_Flac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

//---------------------------------------------------------------------------
#include "MediaInfo/Tag/File__Tags.h"
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down
1 change: 0 additions & 1 deletion Source/MediaInfo/Audio/File_Iamf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

//---------------------------------------------------------------------------
#include "MediaInfo/File__Analyze.h"
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down
12 changes: 10 additions & 2 deletions Source/MediaInfo/File__Analyze.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <aescpp.h>
#endif //MEDIAINFO_AES
#include "MediaInfo/HashWrapper.h"
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down Expand Up @@ -918,8 +919,14 @@ public :
#if defined(MEDIAINFO_AV1_YES) || defined(MEDIAINFO_AVC_YES) || defined(MEDIAINFO_HEVC_YES) || defined(MEDIAINFO_MPEG4_YES) || defined(MEDIAINFO_MK_YES) || defined(MEDIAINFO_MXF_YES) || defined(MEDIAINFO_MPEGTS_YES)
struct mastering_metadata_2086
{
int16u Primaries[8];
int32u Luminance[2];
int16u Primaries[8]{};
int32u Luminance[2]{};

bool operator==(const mastering_metadata_2086& o) const
{
return !std::memcmp(Primaries, o.Primaries, sizeof(Primaries)) && !std::memcmp(Luminance, o.Luminance, sizeof(Luminance)) ;
}
bool operator!=(const mastering_metadata_2086& o) const { return !(*this == o); }
};
void Get_MasteringDisplayColorVolume(Ztring &MasteringDisplay_ColorPrimaries, Ztring &MasteringDisplay_Luminance, mastering_metadata_2086 &Meta, bool FromAV1=false);
#endif
Expand Down Expand Up @@ -1825,4 +1832,5 @@ public :
} \
} \


#endif
10 changes: 8 additions & 2 deletions Source/MediaInfo/File__Analyze_MinimizeSize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,14 @@ public :
#if defined(MEDIAINFO_AV1_YES) || defined(MEDIAINFO_AVC_YES) || defined(MEDIAINFO_HEVC_YES) || defined(MEDIAINFO_MPEG4_YES) || defined(MEDIAINFO_MATROSKA_YES) || defined(MEDIAINFO_MXF_YES) || defined(MEDIAINFO_MPEGTS_YES)
struct mastering_metadata_2086
{
int16u Primaries[8];
int32u Luminance[2];
int16u Primaries[8]{};
int32u Luminance[2]{};

bool operator==(const mastering_metadata_2086& o) const
{
return !std::memcmp(Primaries, o.Primaries, sizeof(Primaries)) && !std::memcmp(Luminance, o.Luminance, sizeof(Luminance));
}
bool operator!=(const mastering_metadata_2086& o) const { return !(*this == o); }
};
void Get_MasteringDisplayColorVolume(Ztring &MasteringDisplay_ColorPrimaries, Ztring &MasteringDisplay_Luminance, mastering_metadata_2086 &Meta, bool FromAV1=false);
#endif
Expand Down
1 change: 0 additions & 1 deletion Source/MediaInfo/Image/File_Jpeg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

//---------------------------------------------------------------------------
#include "MediaInfo/File__Analyze.h"
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down
1 change: 0 additions & 1 deletion Source/MediaInfo/Image/File_Png.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#include "MediaInfo/Tag/File_Xmp.h"
#endif
#include <zlib.h>
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down
1 change: 0 additions & 1 deletion Source/MediaInfo/Image/File_Png.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
//---------------------------------------------------------------------------
#include "MediaInfo/File__Analyze.h"
#include "MediaInfo/TimeCode.h"
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down
1 change: 0 additions & 1 deletion Source/MediaInfo/Multiple/File_Ivf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

//---------------------------------------------------------------------------
#include "MediaInfo/File__Analyze.h"
#include <memory>
//---------------------------------------------------------------------------

namespace MediaInfoLib
Expand Down
Loading
Loading