Skip to content

MP4: Initial APV support #2458

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

Open
cjee21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MP4: Initial APV support #2458

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
2 changes: 2 additions & 0 deletions Source/MediaInfo/MediaInfo_Config_Automatic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,7 @@ void MediaInfo_Config_Format (InfoMap &Info)
"WebM;;;M;Mkv;;webm;video/webm;http://www.webmproject.org/\n"
"Windows Media;;;M;Wm;;asf dvr-ms wma wmv;video/x-ms-wmv\n"
"WTV;;;M;Wtv;;wtv\n"
"APV;;;V;;Advanced Professional Video;apv;;https://github.com/AcademySoftwareFoundation/openapv\n"
"AV1;;;V;Av1;AOMedia Video 1;;;http://aomedia.org/\n"
"AVC;;;V;Avc;Advanced Video Codec;avc h264 264;video/H264;http://developers.videolan.org/x264.html\n"
"AVS Video;;;V;AvsV;Audio Video Standard, Video part;;;http://www.avs.org.cn/;Lossy\n"
Expand Down Expand Up @@ -1726,6 +1727,7 @@ void MediaInfo_Config_CodecID_Video_Mpeg4 (InfoMap &Info)
"ai56;AVC;;Advanced Video Coding\n"
"ai5p;AVC;;Advanced Video Coding\n"
"ai5q;AVC;;Advanced Video Coding\n"
"apv1;APV\n"
"AV01;AV1\n"
"av01;AV1\n"
"AV1x;YUV;;;;;;YUV;4:2:2\n"
Expand Down
1 change: 1 addition & 0 deletions Source/MediaInfo/Multiple/File_Mpeg4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ private :
void moov_trak_mdia_minf_stbl_stsd_xxxx_AALP();
void moov_trak_mdia_minf_stbl_stsd_xxxx_ACLR();
void moov_trak_mdia_minf_stbl_stsd_xxxx_APRG();
void moov_trak_mdia_minf_stbl_stsd_xxxx_apvC();
void moov_trak_mdia_minf_stbl_stsd_xxxx_ARES();
void moov_trak_mdia_minf_stbl_stsd_xxxx_AORD();
void moov_trak_mdia_minf_stbl_stsd_xxxx_av1C();
Expand Down
91 changes: 91 additions & 0 deletions Source/MediaInfo/Multiple/File_Mpeg4_Elements.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,7 @@ namespace Elements
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_ACLR=0x41434C52;
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_amve=0x616D7665;
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_APRG=0x41505247;
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_apvC=0x61707643;
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_ARES=0x41524553;
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_AORD=0x414F5244;
const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_av1C=0x61763143;
Expand Down Expand Up @@ -1340,6 +1341,7 @@ void File_Mpeg4::Data_Parse()
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_ACLR)
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_amve)
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_APRG)
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_apvC)
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_ARES)
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_AORD)
ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_av1C)
Expand Down Expand Up @@ -7120,6 +7122,95 @@ void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_APRG()
Skip_B4( "Reserved"); // Must be 0
}

//---------------------------------------------------------------------------
void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_apvC()
{
NAME_VERSION_FLAG("APVDecoderConfigurationBox");
AddCodecConfigurationBoxInfo();

auto APV_Profile =
[](int8u profile_idc) -> const char* {
switch (profile_idc) {
case 33: return "422-10";
case 44: return "422-12";
case 55: return "444-10";
case 66: return "444-12";
case 77: return "4444-10";
case 88: return "4444-12";
case 99: return "400-10";
default: return "";
}
};

auto APV_Chroma =
[](int8u chroma_format_idc) -> const char* {
switch (chroma_format_idc) {
case 0: return "4:0:0";
case 2: return "4:2:2";
case 3: return "4:4:4";
case 4: return "4:4:4:4";
default: return "";
}
};

//Parsing
Element_Begin1("APVDecoderConfigurationRecord");
int8u number_of_configuration_entry, number_of_frame_info;
int8u profile_idc, level_idc, band_idc, chroma_format_idc, bit_depth_minus8;
int8u color_primaries, transfer_characteristics, matrix_coefficients;
bool color_description_present_flag, full_range_flag;
Skip_B1( "configurationVersion");
Get_B1 (number_of_configuration_entry, "number_of_configuration_entry");
for (int8u i = 0; i < number_of_configuration_entry; ++i) {
Skip_B1( "pbu_type[i]");
Get_B1 (number_of_frame_info, "number_of_frame_info[i]");
for (int8u j = 0; j < number_of_frame_info; ++j) {
BS_Begin();
Skip_S1(6, "reserved_zero_6bits");
Get_SB (color_description_present_flag, "color_description_present_flag[i][j]");
Skip_SB( "capture_time_distance_ignored[i][j]");
BS_End();
Get_B1 (profile_idc, "profile_idc[i][j]"); Param_Info1(APV_Profile(profile_idc));
Get_B1 (level_idc, "level_idc[i][j]"); Param_Info3((float)level_idc / 30, nullptr, 1);
Get_B1 (band_idc, "band_idc[i][j]");
Skip_B4( "frame_width[i][j]");
Skip_B4( "frame_height[i][j]");
BS_Begin();
Get_S1 (4, chroma_format_idc, "chroma_format_idc[i][j]"); Param_Info1(APV_Chroma(chroma_format_idc));
Get_S1 (4, bit_depth_minus8, "bit_depth_minus8[i][j]");
BS_End();
Skip_B1( "capture_time_distance[i][j]");
if (color_description_present_flag) {
Get_B1 (color_primaries, "color_primaries[i][j]"); Param_Info1(Mpegv_colour_primaries(color_primaries));
Get_B1 (transfer_characteristics, "transfer_characteristics[i][j]"); Param_Info1(Mpegv_transfer_characteristics(transfer_characteristics));
Get_B1 (matrix_coefficients, "matrix_coefficients[i][j]"); Param_Info1(Mpegv_matrix_coefficients(matrix_coefficients));
BS_Begin();
Get_SB (full_range_flag, "full_range_flag[i][j]");
Skip_S1(7, "reserved_zero_7bits");
BS_End();
}
}
}
Element_End0();

//Filling
FILLING_BEGIN_PRECISE();
if (number_of_configuration_entry == 1 && number_of_frame_info == 1) { //TODO: handle multiple
Fill(Stream_Video, StreamPos_Last, Video_Format_Profile, APV_Profile(profile_idc));
Fill(Stream_Video, StreamPos_Last, Video_Format_Level, (float)level_idc / 30, 1);
Fill(Stream_Video, StreamPos_Last, "band_idc", band_idc);
Fill(Stream_Video, StreamPos_Last, Video_ChromaSubsampling, APV_Chroma(chroma_format_idc));
Fill(Stream_Video, StreamPos_Last, Video_BitDepth, bit_depth_minus8 + 8);
if (color_description_present_flag) {
Fill(Stream_Video, StreamPos_Last, Video_colour_primaries, Mpegv_colour_primaries(color_primaries));
Fill(Stream_Video, StreamPos_Last, Video_transfer_characteristics, Mpegv_transfer_characteristics(transfer_characteristics));
Fill(Stream_Video, StreamPos_Last, Video_matrix_coefficients, Mpegv_matrix_coefficients(matrix_coefficients));
Fill(Stream_Video, StreamPos_Last, Video_colour_range, full_range_flag ? "Full" : "Limited");
}
}
FILLING_END();
}

//---------------------------------------------------------------------------
void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_ARES()
{
Expand Down
1 change: 1 addition & 0 deletions Source/Resource/Text/DataBase/CodecID_Video_Mpeg4.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ai55;AVC;;Advanced Video Coding;;;;
ai56;AVC;;Advanced Video Coding;;;;
ai5p;AVC;;Advanced Video Coding;;;;
ai5q;AVC;;Advanced Video Coding;;;;
apv1;APV;;;;;;
AV01;AV1;;;;;;
av01;AV1;;;;;;
AV1x;YUV;;;;;;YUV;4:2:2
Expand Down
1 change: 1 addition & 0 deletions Source/Resource/Text/DataBase/Format.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ SKM;;;M;Skm;Sky Korean Mobilephone;skm;;http://www.isky.co.kr/html/cs/download.j
WebM;;;M;Mkv;;webm;video/webm;http://www.webmproject.org/;
Windows Media;;;M;Wm;;asf dvr-ms wma wmv;video/x-ms-wmv;;
WTV;;;M;Wtv;;wtv;;;
APV;;;V;;Advanced Professional Video;apv;;https://github.com/AcademySoftwareFoundation/openapv
AV1;;;V;Av1;AOMedia Video 1;;;http://aomedia.org/
AVC;;;V;Avc;Advanced Video Codec;avc h264 264;video/H264;http://developers.videolan.org/x264.html
AVS Video;;;V;AvsV;Audio Video Standard, Video part;;;http://www.avs.org.cn/;Lossy
Expand Down