Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions Source/MediaInfo/MediaInfo_Config_Automatic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,8 @@ void MediaInfo_Config_Format (InfoMap &Info)
"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"
"AVS3 Video;;;V;Avs3V;Audio Video Standard 3, Video part;avs3;;http://www.avs.org.cn/;Lossy\n"
"Cinegy Daniel;;;V;;;;;https://www.cinegy.com;\n"
"Cinegy Daniel2;;;V;;;;;https://www.cinegy.com;\n"
"Dirac;;;V;Dirac;;drc;;http://diracvideo.org/;Lossy\n"
"FFV1;;;V;;;;;;Lossless\n"
"FFV2;;;V;;;;;;Lossless\n"
Expand Down Expand Up @@ -1761,12 +1763,15 @@ void MediaInfo_Config_CodecID_Video_Mpeg4 (InfoMap &Info)
"brhq;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;HQ\n"
"brvl;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;VL\n"
"brvn;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;VN\n"
"CDA2;Cinegy Daniel2;;;https://www.cinegy.com;;;;\n"
"CFHD;CineForm;;CineForm High-Definition (HD) wavelet codec;http://www.cineform.com/\n"
"CHQX;Canopus HQX\n"
"CLLC;Canopus Lossless\n"
"CNGA;Cinegy Daniel;;;https://www.cinegy.com;;;RGBA;\n"
"CUVC;Canopus HQ\n"
"cmyk;CMYK\n"
"cvid;Cinepak;;;http://www.apple.com/quicktime/download/standalone.html\n"
"DNL2;Cinegy Daniel2;;;https://www.cinegy.com;;;;\n"
"drac;Dirac;;Dirac Video Coder;http://www.bbc.co.uk/rd/projects/dirac/index.shtml\n"
"dslv;Cross Fade;;;http://www.apple.com/quicktime/download/standalone.html\n"
"DV10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/\n"
Expand Down Expand Up @@ -2029,6 +2034,7 @@ void MediaInfo_Config_CodecID_Video_Riff (InfoMap &Info)
"BXY2;YUV;Boxx;10-bit;;;;YUV\n"
"BXYV;YUV;Boxx;;;;;YUV\n"
"CC12;YUV;Intel;;;;;YUV\n"
"CDA2;Cinegy Daniel2;;;https://www.cinegy.com;;;;\n"
"CDV5;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV\n"
"CDVC;DV;Canopus;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm;;;YUV\n"
"CDVH;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV\n"
Expand All @@ -2043,6 +2049,7 @@ void MediaInfo_Config_CodecID_Video_Riff (InfoMap &Info)
"CLPL;YUV;;Format similar to YV12 but including a level of indirection.;;;;YUV\n"
"CM10;MediaShow;;CyberLink Corporation;http://www.cyberlink.com\n"
"CMYK;CMYK;;Common Data Format in Printing\n"
"CNGA;Cinegy Daniel;;;https://www.cinegy.com;;;RGBA;\n"
"COL0;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
"COL1;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
"CPLA;YUV;Weitek;;;;;YUV;4:2:0\n"
Expand Down Expand Up @@ -2079,6 +2086,7 @@ void MediaInfo_Config_CodecID_Video_Riff (InfoMap &Info)
"DMB1;JPEG;Rainbow;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe;;;YUV\n"
"DMB2;JPEG;Paradigm;;;;;YUV\n"
"DMK2;V36 PDA;;ViewSonic V36 PDA Video\n"
"DNL2;Cinegy Daniel2;;;https://www.cinegy.com;;;;\n"
"DP02;MPEG-4 Visual;DynaPel;;;;;YUV;4:2:0\n"
"DP16;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:1:1\n"
"DP18;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:1:1\n"
Expand Down
122 changes: 89 additions & 33 deletions Source/MediaInfo/Multiple/File_Mxf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,16 @@ static const char* Mxf_EssenceContainer(const int128u EssenceContainer)
}
default : return "";
}
case 0x21 : //Fraunhofer
switch (Code3)
{
case 0x02 :
switch (Code4)
{
default: return "Cinegy Daniel2";
}
default: return "Cinegy";
}
default : return "";
}
default : return "";
Expand Down Expand Up @@ -724,6 +734,17 @@ static const char* Mxf_EssenceCompression(const int128u EssenceCompression)
}
default : return "";
}
case 0x21 : //Fraunhofer
switch (Code3)
{
case 0x01 :
switch (Code4)
{
case 0x01 : return "Cinegy Daniel2";
default : return "";
}
default : return "Cinegy";
}
default : return "";
}
default : return "";
Expand All @@ -733,6 +754,7 @@ static const char* Mxf_EssenceCompression(const int128u EssenceCompression)
//---------------------------------------------------------------------------
static const char* Mxf_EssenceCompression_Profile(const int128u& EssenceCompression)
{
int8u Code1=(int8u)((EssenceCompression.lo&0xFF00000000000000LL)>>56);
int8u Code2=(int8u)((EssenceCompression.lo&0x00FF000000000000LL)>>48);
int8u Code3=(int8u)((EssenceCompression.lo&0x0000FF0000000000LL)>>40);
int8u Code4=(int8u)((EssenceCompression.lo&0x000000FF00000000LL)>>32);
Expand All @@ -741,61 +763,95 @@ static const char* Mxf_EssenceCompression_Profile(const int128u& EssenceCompress
int8u Code7=(int8u)((EssenceCompression.lo&0x000000000000FF00LL)>> 8);
int8u Code8=(int8u)((EssenceCompression.lo&0x00000000000000FFLL) );

switch (Code2)
switch (Code1)
{
case 0x01 : //Picture
switch (Code3)
case 0x0D : //
switch (Code2)
{
case 0x02 : //Coding characteristics
switch (Code4)
case 0x01 : //Picture
switch (Code3)
{
case 0x02 : //Compressed coding
switch (Code5)
case 0x02 : //Coding characteristics
switch (Code4)
{
case 0x01 : //MPEG Compression
switch (Code6)
case 0x02 : //Compressed coding
switch (Code5)
{
case 0x20 : //MPEG-4 Visual
switch (Code7)
case 0x01 : //MPEG Compression
switch (Code6)
{
case 0x10 : //
switch (Code8)
case 0x20 : //MPEG-4 Visual
switch (Code7)
{
case 0x10 : //
switch (Code8)
{
case 0x01 :
case 0x02 :
case 0x03 :
case 0x04 :
return Mpeg4v_Profile_Level(B8(11100000)+Code8);
case 0x05 :
case 0x06 :
return Mpeg4v_Profile_Level(B8(11101011)-5+Code8);
default : return "";
}
default : return "";
}
default : return "";
}
case 0x03 : //Individual Picture Coding Schemes
switch (Code6)
{
case 0x06 : //ProRes
switch (Code7)
{
case 0x01 :
case 0x02 :
case 0x03 :
case 0x04 :
return Mpeg4v_Profile_Level(B8(11100000)+Code8);
case 0x05 :
case 0x06 :
return Mpeg4v_Profile_Level(B8(11101011)-5+Code8);
case 0x01 : return "422 Proxy";
case 0x02 : return "422 LT";
case 0x03 : return "422";
case 0x04 : return "422 HQ";
case 0x05 : return "4444";
case 0x06 : return "4444 XQ";
default : return "";
}
default : return "";
}
default : return "";
}
case 0x03 : //Individual Picure Coding Schemes
switch (Code6)
default : return "";
}
default : return "";
}
default : return "";
}
case 0x0E : //Private Use
switch (Code2)
{
case 0x21 : //Fraunhofer
switch (Code3)
{
case 0x01 :
switch (Code4)
{
case 0x01 :
switch (Code5)
{
case 0x06 : //ProRes
switch (Code7)
case 0x01 :
switch (Code7 & 0xF0)
{
case 0x01 : return "422 Proxy";
case 0x02 : return "422 LT";
case 0x03 : return "422";
case 0x04 : return "422 HQ";
case 0x05 : return "4444";
case 0x06 : return "4444 XQ";
case 0x10 : return "M0";
case 0x20 : return "M1";
case 0x30 : return "M2";
case 0x40 : return "M3";
default : return "";
}
default : return "";
}
default : return "";
default : return "";
}
default : return "";
}
default : return "";
default : return "";
}
default : return "";
}
Expand Down
3 changes: 3 additions & 0 deletions Source/Resource/Text/DataBase/CodecID_Video_Mpeg4.csv
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,15 @@ brvm;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;VM
brhq;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;HQ;;;
brvl;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;VL;;;
brvn;Blackmagic RAW;;;https://www.blackmagicdesign.com/products/blackmagicraw;VN;;;
CDA2;Cinegy Daniel2;;;https://www.cinegy.com;;;;
CFHD;CineForm;;CineForm High-Definition (HD) wavelet codec;http://www.cineform.com/;;;;
CHQX;Canopus HQX;;;;;;;
CLLC;Canopus Lossless;;;;;;;
CNGA;Cinegy Daniel;;;https://www.cinegy.com;;;RGBA;
CUVC;Canopus HQ;;;;;;;
cmyk;CMYK;;;;;;;
cvid;Cinepak;;;http://www.apple.com/quicktime/download/standalone.html;;;;
DNL2;Cinegy Daniel2;;;https://www.cinegy.com;;;;
drac;Dirac;;Dirac Video Coder;http://www.bbc.co.uk/rd/projects/dirac/index.shtml;;;;
dslv;Cross Fade;;;http://www.apple.com/quicktime/download/standalone.html;;;;
DV10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;;
Expand Down
3 changes: 3 additions & 0 deletions Source/Resource/Text/DataBase/CodecID_Video_Riff.csv
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ BXRG;RGB;Boxx;;;;;RGB;
BXY2;YUV;Boxx;10-bit;;;;YUV;
BXYV;YUV;Boxx;;;;;YUV;
CC12;YUV;Intel;;;;;YUV;
CDA2;Cinegy Daniel2;;;https://www.cinegy.com;;;;
CDV5;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV;
CDVC;DV;Canopus;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm;;;YUV;
CDVH;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV;
Expand All @@ -106,6 +107,7 @@ CLLC;Canopus Lossless;;;;;;;
CLPL;YUV;;Format similar to YV12 but including a level of indirection.;;;;YUV;
CM10;MediaShow;;CyberLink Corporation;http://www.cyberlink.com;;;;
CMYK;CMYK;;Common Data Format in Printing;;;;;
CNGA;Cinegy Daniel;;;https://www.cinegy.com;;;RGBA;
COL0;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
COL1;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
CPLA;YUV;Weitek;;;;;YUV;4:2:0
Expand Down Expand Up @@ -142,6 +144,7 @@ DM4V;MPEG-4 Visual;Dicas;;;;;YUV;4:2:0
DMB1;JPEG;Rainbow;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe;;;YUV
DMB2;JPEG;Paradigm;;;;;YUV
DMK2;V36 PDA;;ViewSonic V36 PDA Video;;;;;
DNL2;Cinegy Daniel2;;;https://www.cinegy.com;;;;
DP02;MPEG-4 Visual;DynaPel;;;;;YUV;4:2:0
DP16;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:1:1
DP18;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:1:1
Expand Down
Loading