[haiku-commits] r38978 - haiku/trunk/src/add-ons/media/plugins/ffmpeg

Author: stippi
Date: 2010-10-15 17:27:16 +0200 (Fri, 15 Oct 2010)
New Revision: 38978
Changeset: http://dev.haiku-os.org/changeset/38978

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
Log:
Enable DV format (muxer) and DV encoder. It works, but only for
certain video sizes (720x576 for example) and with 48 kHz raw
audio. Clockwerk actually uses a mechanism which worked on BeOS
to check if an encoder would accept a certain media_format, but
this does not yet work on Haiku and thus the format is available
even when trying to render later will fail.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp       
2010-10-15 15:23:49 UTC (rev 38977)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp       
2010-10-15 15:27:16 UTC (rev 38978)
@@ -10,7 +10,7 @@
 const EncoderDescription gEncoderTable[] = {
        {
                {
-                       "MPEG4 video",
+                       "MPEG-4 video",
                        "mpeg4",
                        0,
                        CODEC_ID_MPEG4,
@@ -23,7 +23,7 @@
        },
        {
                {
-                       "MPEG1 video",
+                       "MPEG-1 video",
                        "mpeg1video",
                        0,
                        CODEC_ID_MPEG1VIDEO,
@@ -36,7 +36,7 @@
        },
        {
                {
-                       "MPEG2 video",
+                       "MPEG-2 video",
                        "mpeg2video",
                        0,
                        CODEC_ID_MPEG2VIDEO,
@@ -58,10 +58,23 @@
                B_ANY_FORMAT_FAMILY,
                B_MEDIA_RAW_VIDEO,
                B_MEDIA_ENCODED_VIDEO,
-               23
+               18
        },
        {
                {
+                       "DV (Digital Video)",
+                       "dvvideo",
+                       0,
+                       CODEC_ID_DVVIDEO,
+                       { 0 }
+               },
+               B_MISC_FORMAT_FAMILY,
+               B_MEDIA_RAW_VIDEO,
+               B_MEDIA_ENCODED_VIDEO,
+               5
+       },
+       {
+               {
                        "Raw audio",
                        "pcm",
                        0,

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp 2010-10-15 
15:23:49 UTC (rev 38977)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp 2010-10-15 
15:27:16 UTC (rev 38978)
@@ -31,6 +31,22 @@
                        | media_file_format::B_KNOWS_ENCODED_VIDEO
                        | media_file_format::B_KNOWS_ENCODED_AUDIO,
                { 0 },
+               B_MISC_FORMAT_FAMILY,
+               100,
+               { 0 },
+               "video/x-msvideo",
+               "DV video format",
+               "dv",
+               "dv",
+               { 0 }
+       },
+       {
+               media_file_format::B_WRITABLE
+                       | media_file_format::B_KNOWS_RAW_VIDEO
+                       | media_file_format::B_KNOWS_RAW_AUDIO
+                       | media_file_format::B_KNOWS_ENCODED_VIDEO
+                       | media_file_format::B_KNOWS_ENCODED_AUDIO,
+               { 0 },
                B_AVI_FORMAT_FAMILY,
                100,
                { 0 },

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h       2010-10-15 
15:23:49 UTC (rev 38977)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h       2010-10-15 
15:27:16 UTC (rev 38978)
@@ -507,7 +507,7 @@
 #define CONFIG_ASV2_ENCODER 0
 #define CONFIG_BMP_ENCODER 0
 #define CONFIG_DNXHD_ENCODER 0
-#define CONFIG_DVVIDEO_ENCODER 0
+#define CONFIG_DVVIDEO_ENCODER 1
 #define CONFIG_FFV1_ENCODER 0
 #define CONFIG_FFVHUFF_ENCODER 0
 #define CONFIG_FLASHSV_ENCODER 0
@@ -548,7 +548,7 @@
 #define CONFIG_WMV2_ENCODER 0
 #define CONFIG_ZLIB_ENCODER 0
 #define CONFIG_ZMBV_ENCODER 0
-#define CONFIG_AAC_ENCODER 0
+#define CONFIG_AAC_ENCODER 1
 #define CONFIG_AC3_ENCODER 1
 #define CONFIG_ALAC_ENCODER 0
 #define CONFIG_FLAC_ENCODER 0
@@ -792,7 +792,7 @@
 #define CONFIG_DIRAC_MUXER 0
 #define CONFIG_DNXHD_MUXER 0
 #define CONFIG_DTS_MUXER 0
-#define CONFIG_DV_MUXER 0
+#define CONFIG_DV_MUXER 1
 #define CONFIG_EAC3_MUXER 0
 #define CONFIG_FFM_MUXER 0
 #define CONFIG_FILMSTRIP_MUXER 0


Other related posts: