Skip to content

Commit 0fd700a

Browse files
cjee21cjee21
committed
AV2: Initial support
1 parent b1c5fb1 commit 0fd700a

File tree

17 files changed

+1278
-3
lines changed

17 files changed

+1278
-3
lines changed

‎Project/CMake/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ set(MediaInfoLib_SRCS
336336
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_Aic.cpp
337337
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_AfdBarData.cpp
338338
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_Av1.cpp
339+
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_Av2.cpp
339340
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_Avc.cpp
340341
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_Avc_Duplicate.cpp
341342
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_AvsV.cpp

‎Project/GNU/Library/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
222222
../../../Source/MediaInfo/Video/File_Aic.cpp \
223223
../../../Source/MediaInfo/Video/File_AfdBarData.cpp \
224224
../../../Source/MediaInfo/Video/File_Av1.cpp \
225+
../../../Source/MediaInfo/Video/File_Av2.cpp \
225226
../../../Source/MediaInfo/Video/File_Avc.cpp \
226227
../../../Source/MediaInfo/Video/File_Avc_Duplicate.cpp \
227228
../../../Source/MediaInfo/Video/File_AvsV.cpp \

‎Project/GNU/Library/configure.ac‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ AC_ARG_ENABLE(pdf, AC_HELP_STRING([--disable-pdf] , [Disable Text - PDF])
194194
AC_ARG_ENABLE(pgs, AC_HELP_STRING([--disable-pgs] , [Disable Text - PGS]), MediaInfoPgs=$enableval, MediaInfoPgs=depend)
195195
AC_ARG_ENABLE(scc, AC_HELP_STRING([--disable-scc] , [Disable Text - SCC]), MediaInfoScc=$enableval, MediaInfoScc=depend)
196196
AC_ARG_ENABLE(aic, AC_HELP_STRING([--disable-aic], [Disable Video - AIC (Apple Intermediate Codec)]), MediaInfoAic=$enableval, MediaInfoAic=depend)
197-
AC_ARG_ENABLE(av1, AC_HELP_STRING([--disable-av1], [Disable Video - Aomedia AV1]), MediaInfoAv1=$enableval, MediaInfoAv1=depend)
197+
AC_ARG_ENABLE(av1, AC_HELP_STRING([--disable-av1], [Disable Video - AOMedia Video 1 (AV1)]), MediaInfoAv1=$enableval, MediaInfoAv1=depend)
198+
AC_ARG_ENABLE(av2, AC_HELP_STRING([--disable-av2], [Disable Video - AOMedia Video 2 (AV2)]), MediaInfoAv2=$enableval, MediaInfoAv2=depend)
198199
AC_ARG_ENABLE(avc, AC_HELP_STRING([--disable-avc], [Disable Video - AVC/H264]), MediaInfoAvc=$enableval, MediaInfoAvc=depend)
199200
AC_ARG_ENABLE(avsV, AC_HELP_STRING([--disable-avsv], [Disable Video - AVS (Chinese)]), MediaInfoAvsV=$enableval, MediaInfoAvsV=depend)
200201
AC_ARG_ENABLE(Avs3V, AC_HELP_STRING([--disable-Avs3V], [Disable Video - AVS3 (Chinese)]), MediaInfoAvs3V=$enableval, MediaInfoAvs3V=depend)
@@ -374,6 +375,7 @@ if test "$MediaInfoPgs" = "no"; then AC_DEFINE(MEDIAINFO_PGS_NO) fi; if
374375
if test "$MediaInfoScc" = "no"; then AC_DEFINE(MEDIAINFO_SCC_NO) fi; if test "$MediaInfoScc" = "yes"; then AC_DEFINE(MEDIAINFO_SCC_YES) fi
375376
if test "$MediaInfoAic" = "no"; then AC_DEFINE(MEDIAINFO_AIC_NO) fi; if test "$MediaInfoAic" = "yes"; then AC_DEFINE(MEDIAINFO_AIC_YES) fi
376377
if test "$MediaInfoAv1" = "no"; then AC_DEFINE(MEDIAINFO_AV1_NO) fi; if test "$MediaInfoAv1" = "yes"; then AC_DEFINE(MEDIAINFO_AV1_YES) fi
378+
if test "$MediaInfoAv2" = "no"; then AC_DEFINE(MEDIAINFO_AV2_NO) fi; if test "$MediaInfoAv2" = "yes"; then AC_DEFINE(MEDIAINFO_AV2_YES) fi
377379
if test "$MediaInfoAvc" = "no"; then AC_DEFINE(MEDIAINFO_AVC_NO) fi; if test "$MediaInfoAvc" = "yes"; then AC_DEFINE(MEDIAINFO_AVC_YES) fi
378380
if test "$MediaInfoAvsV" = "no"; then AC_DEFINE(MEDIAINFO_AVSV_NO) fi; if test "$MediaInfoAvsV" = "yes"; then AC_DEFINE(MEDIAINFO_AVSV_YES) fi
379381
if test "$MediaInfoAvs3V" = "no"; then AC_DEFINE(MEDIAINFO_AVS3V_NO) fi; if test "$MediaInfoAvs3V" = "yes"; then AC_DEFINE(MEDIAINFO_AVS3V_YES) fi
@@ -1148,6 +1150,7 @@ Mcho "Pgs " "$MediaInfoPgs"
11481150
Mcho "Scc " "$MediaInfoScc"
11491151
Mcho "Aic " "$MediaInfoAic"
11501152
Mcho "Av1 " "$MediaInfoAv1"
1153+
Mcho "Av2 " "$MediaInfoAv2"
11511154
Mcho "Avc " "$MediaInfoAvc"
11521155
Mcho "AvsV " "$MediaInfoAvsV"
11531156
Mcho "Avs3V " "$MediaInfoAvs3V"

‎Project/MSVC2022/Library/MediaInfoLib.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@
503503
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">NotUsing</PrecompiledHeader>
504504
</ClCompile>
505505
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av1.cpp" />
506+
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av2.cpp" />
506507
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Avs3V.cpp" />
507508
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_CineForm.cpp" />
508509
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_DolbyVisionMetadata.cpp" />
@@ -926,6 +927,7 @@
926927
<ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Ttml.h" />
927928
<ClInclude Include="..\..\..\Source\MediaInfo\TimeCode.h" />
928929
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av1.h" />
930+
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av2.h" />
929931
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_CineForm.h" />
930932
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_DolbyVisionMetadata.h" />
931933
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_HdrVividMetadata.h" />

‎Project/MSVC2022/Library/MediaInfoLib.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,9 @@
887887
<ClCompile Include="..\..\..\Source\ThirdParty\fmt\format.cc">
888888
<Filter>ThirdParty\fmt</Filter>
889889
</ClCompile>
890+
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av2.cpp">
891+
<Filter>Source Files\Video</Filter>
892+
</ClCompile>
890893
</ItemGroup>
891894
<ItemGroup>
892895
<ClInclude Include="..\..\..\Source\MediaInfo\File__Analyse_Automatic.h">
@@ -1666,5 +1669,8 @@
16661669
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_GainMap.h">
16671670
<Filter>Header Files\Image</Filter>
16681671
</ClInclude>
1672+
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av2.h">
1673+
<Filter>Header Files\Video</Filter>
1674+
</ClInclude>
16691675
</ItemGroup>
16701676
</Project>

‎Project/MSVC2026/Library/MediaInfoLib.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@
503503
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">NotUsing</PrecompiledHeader>
504504
</ClCompile>
505505
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av1.cpp" />
506+
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av2.cpp" />
506507
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Avs3V.cpp" />
507508
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_CineForm.cpp" />
508509
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_DolbyVisionMetadata.cpp" />
@@ -926,6 +927,7 @@
926927
<ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Ttml.h" />
927928
<ClInclude Include="..\..\..\Source\MediaInfo\TimeCode.h" />
928929
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av1.h" />
930+
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av2.h" />
929931
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_CineForm.h" />
930932
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_DolbyVisionMetadata.h" />
931933
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_HdrVividMetadata.h" />

‎Project/MSVC2026/Library/MediaInfoLib.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,9 @@
887887
<ClCompile Include="..\..\..\Source\ThirdParty\fmt\format.cc">
888888
<Filter>ThirdParty\fmt</Filter>
889889
</ClCompile>
890+
<ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Av2.cpp">
891+
<Filter>Source Files\Video</Filter>
892+
</ClCompile>
890893
</ItemGroup>
891894
<ItemGroup>
892895
<ClInclude Include="..\..\..\Source\MediaInfo\File__Analyse_Automatic.h">
@@ -1666,5 +1669,8 @@
16661669
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_GainMap.h">
16671670
<Filter>Header Files\Image</Filter>
16681671
</ClInclude>
1672+
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Av2.h">
1673+
<Filter>Header Files\Video</Filter>
1674+
</ClInclude>
16691675
</ItemGroup>
16701676
</Project>

‎Project/Qt/MediaInfoLib.pro‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ HEADERS += \
245245
../../Source/MediaInfo/TimeCode.h \
246246
../../Source/MediaInfo/Video/File_AfdBarData.h \
247247
../../Source/MediaInfo/Video/File_Aic.h \
248+
../../Source/MediaInfo/Video/File_Av1.h \
249+
../../Source/MediaInfo/Video/File_Av2.h \
248250
../../Source/MediaInfo/Video/File_Avc.h \
249251
../../Source/MediaInfo/Video/File_AvsV.h \
250252
../../Source/MediaInfo/Video/File_Avs3V.h \
@@ -492,6 +494,8 @@ SOURCES += \
492494
../../Source/MediaInfo/TimeCode.cpp \
493495
../../Source/MediaInfo/Video/File_AfdBarData.cpp \
494496
../../Source/MediaInfo/Video/File_Aic.cpp \
497+
../../Source/MediaInfo/Video/File_Av1.cpp \
498+
../../Source/MediaInfo/Video/File_Av2.cpp \
495499
../../Source/MediaInfo/Video/File_Avc.cpp \
496500
../../Source/MediaInfo/Video/File_Avc_Duplicate.cpp \
497501
../../Source/MediaInfo/Video/File_AvsV.cpp \

‎Source/MediaInfo/File__MultipleParsing.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@
149149
#if defined(MEDIAINFO_AV1_YES)
150150
#include "MediaInfo/Video/File_Av1.h"
151151
#endif
152+
#if defined(MEDIAINFO_AV2_YES)
153+
#include "MediaInfo/Video/File_Av2.h"
154+
#endif
152155
#if defined(MEDIAINFO_AVSV_YES)
153156
#include "MediaInfo/Video/File_AvsV.h"
154157
#endif
@@ -599,6 +602,9 @@ File__MultipleParsing::File__MultipleParsing()
599602
#if defined(MEDIAINFO_AV1_YES)
600603
Parser.push_back(new File_Av1());
601604
#endif
605+
#if defined(MEDIAINFO_AV2_YES)
606+
Parser.push_back(new File_Av2());
607+
#endif
602608
#if defined(MEDIAINFO_AVS3V_YES)
603609
Parser.push_back(new File_Avs3V());
604610
#endif

‎Source/MediaInfo/MediaInfo_Config_Automatic.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,6 +1437,7 @@ void MediaInfo_Config_Format (InfoMap &Info)
14371437
"Windows Media;;;M;Wm;;asf dvr-ms wma wmv;video/x-ms-wmv\n"
14381438
"WTV;;;M;Wtv;;wtv\n"
14391439
"AV1;;;V;Av1;AOMedia Video 1;;;http://aomedia.org/\n"
1440+
"AV2;;;V;Av2;AOMedia Video 2;;;http://aomedia.org/\n"
14401441
"AVC;;;V;Avc;Advanced Video Codec;avc h264 264;video/H264;http://developers.videolan.org/x264.html\n"
14411442
"AVS Video;;;V;AvsV;Audio Video Standard, Video part;;;http://www.avs.org.cn/;Lossy\n"
14421443
"AVS3 Video;;;V;Avs3V;Audio Video Standard 3, Video part;avs3;;http://www.avs.org.cn/;Lossy\n"
@@ -1657,6 +1658,7 @@ void MediaInfo_Config_CodecID_Video_Matroska (InfoMap &Info)
16571658
Info.Write(Ztring().From_UTF8(
16581659
"V_UNCOMPRESSED;RGB;;Raw uncompressed video frames\n"
16591660
"V_AV1;AV1;;;http://aomedia.org/\n"
1661+
"V_AV2;AV2;;;http://aomedia.org/\n"
16601662
"V_AVS;AVS Video\n"
16611663
"V_AVS2;AVS2 Video\n"
16621664
"V_AVS3;AVS3 Video\n"

0 commit comments

Comments
 (0)