mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

HACKING: Mention ffmpeg snapshot update

Browse source 
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
This commit is contained in:
Jan Schmidt 2006-02-18 23:12:14 +00:00
parent f675ce7cfd
commit c76561639d
3 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2006-02-17 Wim Taymans <wim@fluendo.com>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_sink_activate): * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_sink_activate):

3
HACKING
View file

@ -249,7 +249,8 @@ THE RECORDS
- list of snapshots used: - list of snapshots used:
CVS-2004-04-11-23-00 CVS-2004-04-11-23-00
* other updates people didn't enter :)
CVS-2006-02-17-04-00
THE REMINDERS THE REMINDERS
------------- -------------

27
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -645,6 +645,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_ADPCM_CT: case CODEC_ID_ADPCM_CT:
case CODEC_ID_ADPCM_SWF: case CODEC_ID_ADPCM_SWF:
case CODEC_ID_ADPCM_YAMAHA: 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; gchar *layout = NULL;
@ -694,6 +697,15 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_ADPCM_YAMAHA: case CODEC_ID_ADPCM_YAMAHA:
layout = "yamaha"; layout = "yamaha";
break; 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: default:
g_assert (0); /* don't worry, we never get here */ g_assert (0); /* don't worry, we never get here */
break; break;
@ -1818,6 +1830,12 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
id = CODEC_ID_ADPCM_SWF; id = CODEC_ID_ADPCM_SWF;
} else if (!strcmp (layout, "yamaha")) { } else if (!strcmp (layout, "yamaha")) {
id = CODEC_ID_ADPCM_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) if (id != CODEC_ID_NONE)
audio = TRUE; audio = TRUE;
@ -2292,6 +2310,15 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
case CODEC_ID_ADPCM_SWF: case CODEC_ID_ADPCM_SWF:
name = "Shockwave ADPCM"; name = "Shockwave ADPCM";
break; 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: case CODEC_ID_ADPCM_YAMAHA:
name = "Yamaha ADPCM"; name = "Yamaha ADPCM";
break; break;