HACKING: Mention ffmpeg snapshot update

Original commit message from CVS:
* HACKING:
Mention ffmpeg snapshot update

* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
Add new codec types from FFMpeg snapshot update to 2006-02-17 4:00 GMT

diff --git a/ChangeLog b/ChangeLog
index 665078e..b95ac06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-19  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * HACKING:
+       Mention ffmpeg snapshot update
+
+       * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
+       (gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
+       Add new codec types from FFMpeg snapshot update to 2006-02-17 4:00 GMT
+
 2006-02-17  Wim Taymans  <wim@fluendo.com>
 
        * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_sink_activate):

diff --git a/HACKING b/HACKING
index e33548a..fecea5e 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -249,7 +249,8 @@ THE RECORDS
 - list of snapshots used:
 
   CVS-2004-04-11-23-00
-
+  * other updates people didn't enter :)
+  CVS-2006-02-17-04-00
 
 THE REMINDERS
 -------------

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 1da1ede..993a994 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -645,6 +645,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
     case CODEC_ID_ADPCM_CT:
     case CODEC_ID_ADPCM_SWF:
     case CODEC_ID_ADPCM_YAMAHA:
+    case CODEC_ID_ADPCM_SBPRO_2:
+    case CODEC_ID_ADPCM_SBPRO_3:
+    case CODEC_ID_ADPCM_SBPRO_4:
       {
         gchar *layout = NULL;
 
@@ -694,6 +697,15 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
           case CODEC_ID_ADPCM_YAMAHA:
             layout = "yamaha";
             break;
+          case CODEC_ID_ADPCM_SBPRO_2:
+            layout = "sbpro2";
+            break;
+          case CODEC_ID_ADPCM_SBPRO_3:
+            layout = "sbpro3";
+            break;
+          case CODEC_ID_ADPCM_SBPRO_4:
+            layout = "sbpro4";
+            break;
           default:
             g_assert (0);       /* don't worry, we never get here */
             break;
@@ -1818,6 +1830,12 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
       id = CODEC_ID_ADPCM_SWF;
     } else if (!strcmp (layout, "yamaha")) {
       id = CODEC_ID_ADPCM_YAMAHA;
+    } else if (!strcmp (layout, "sbpro2")) {
+      id = CODEC_ID_ADPCM_SBPRO_2;
+    } else if (!strcmp (layout, "sbpro3")) {
+      id = CODEC_ID_ADPCM_SBPRO_3;
+    } else if (!strcmp (layout, "sbpro4")) {
+      id = CODEC_ID_ADPCM_SBPRO_4;
     }
     if (id != CODEC_ID_NONE)
       audio = TRUE;
@@ -2292,6 +2310,15 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
     case CODEC_ID_ADPCM_SWF:
       name = "Shockwave ADPCM";
       break;
+    case CODEC_ID_ADPCM_SBPRO_2:
+      name = "SB-Pro ADPCM 2";
+      break;
+    case CODEC_ID_ADPCM_SBPRO_3:
+      name = "SB-Pro ADPCM 3";
+      break;
+    case CODEC_ID_ADPCM_SBPRO_4:
+      name = "SB-Pro ADPCM 4";
+      break;
     case CODEC_ID_ADPCM_YAMAHA:
       name = "Yamaha ADPCM";
       break;