X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmatroska.c;h=c7e96633160dbfd8f58acb837e692ed97b205af0;hb=bc1aebcd07939d2dffdb1967e5a1e829fed23fba;hp=da42b56b33c35032f8aa0c22517345b326add04f;hpb=d3d265b28866f6ef6f9ea588a7049c60c7b74b5b;p=ffmpeg

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index da42b56b33c..c7e96633160 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -22,55 +22,64 @@
 #include "matroska.h"
 
 const CodecTags ff_mkv_codec_tags[]={
-//    {"V_MS/VFW/FOURCC"  , CODEC_ID_NONE},
-    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
-    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
-    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
-    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
-    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
-    {"V_MJPEG"          , CODEC_ID_MJPEG},
-    {"V_REAL/RV10"      , CODEC_ID_RV10},
-    {"V_REAL/RV20"      , CODEC_ID_RV20},
-    {"V_REAL/RV30"      , CODEC_ID_RV30},
-    {"V_REAL/RV40"      , CODEC_ID_RV40},
-    {"V_THEORA"         , CODEC_ID_THEORA},
-    {"V_SNOW"           , CODEC_ID_SNOW},
-/* TODO: Real/Quicktime */
-
-//    {"A_MS/ACM"         , CODEC_ID_NONE},
-    {"A_MPEG/L3"        , CODEC_ID_MP3},
-    {"A_MPEG/L2"        , CODEC_ID_MP2},
-    {"A_MPEG/L1"        , CODEC_ID_MP2},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_U16BE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U16LE},
-//    {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE},
+    {"A_AAC"            , CODEC_ID_AAC},
     {"A_AC3"            , CODEC_ID_AC3},
     {"A_DTS"            , CODEC_ID_DTS},
-    {"A_VORBIS"         , CODEC_ID_VORBIS},
-    {"A_AAC"            , CODEC_ID_AAC},
+    {"A_EAC3"           , CODEC_ID_EAC3},
     {"A_FLAC"           , CODEC_ID_FLAC},
-    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
-    {"A_TTA1"           , CODEC_ID_TTA},
+    {"A_MLP"            , CODEC_ID_MLP},
+    {"A_MPEG/L2"        , CODEC_ID_MP2},
+    {"A_MPEG/L1"        , CODEC_ID_MP2},
+    {"A_MPEG/L3"        , CODEC_ID_MP3},
+    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
+    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
+    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S16BE},
+    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S24BE},
+    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S32BE},
+    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S16LE},
+    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S24LE},
+    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S32LE},
+    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U8},
+    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
     {"A_REAL/14_4"      , CODEC_ID_RA_144},
     {"A_REAL/28_8"      , CODEC_ID_RA_288},
     {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
     {"A_REAL/COOK"      , CODEC_ID_COOK},
-//    {"A_REAL/SIPR"      , CODEC_ID_SIPRO},
-    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
+    {"A_REAL/SIPR"      , CODEC_ID_SIPR},
+    {"A_TRUEHD"         , CODEC_ID_TRUEHD},
+    {"A_TTA1"           , CODEC_ID_TTA},
+    {"A_VORBIS"         , CODEC_ID_VORBIS},
+    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
 
     {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
+    {"S_TEXT/UTF8"      , CODEC_ID_SRT},
     {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , CODEC_ID_SSA},
     {"S_TEXT/SSA"       , CODEC_ID_SSA},
     {"S_ASS"            , CODEC_ID_SSA},
     {"S_SSA"            , CODEC_ID_SSA},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
+    {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
+
+    {"V_DIRAC"          , CODEC_ID_DIRAC},
+    {"V_MJPEG"          , CODEC_ID_MJPEG},
+    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
+    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
+    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
+    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
+    {"V_REAL/RV10"      , CODEC_ID_RV10},
+    {"V_REAL/RV20"      , CODEC_ID_RV20},
+    {"V_REAL/RV30"      , CODEC_ID_RV30},
+    {"V_REAL/RV40"      , CODEC_ID_RV40},
+    {"V_SNOW"           , CODEC_ID_SNOW},
+    {"V_THEORA"         , CODEC_ID_THEORA},
+    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
+    {"V_VP8"            , CODEC_ID_VP8},
 
     {""                 , CODEC_ID_NONE}
-/* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
 };
 
 const CodecMime ff_mkv_mime_tags[] = {
@@ -84,3 +93,9 @@ const CodecMime ff_mkv_mime_tags[] = {
 
     {""                           , CODEC_ID_NONE}
 };
+
+const AVMetadataConv ff_mkv_metadata_conv[] = {
+    { "LEAD_PERFORMER", "performer" },
+    { "PART_NUMBER"   , "track"  },
+    { 0 }
+};