mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-03 01:02:19 +00:00
ext/ffmpeg/: Add new codec ids and fix up some of the codec->mime type mappings
Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_formatid_to_caps), (gst_ffmpeg_get_codecid_longname): * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): Add new codec ids and fix up some of the codec->mime type mappings
This commit is contained in:
parent
19bc30d505
commit
1f260a84da
3 changed files with 51 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2006-02-19 Jan Schmidt <thaytan@mad.scientist.com>
|
||||||
|
|
||||||
|
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
|
||||||
|
(gst_ffmpeg_formatid_to_caps), (gst_ffmpeg_get_codecid_longname):
|
||||||
|
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
|
||||||
|
Add new codec ids and fix up some of the codec->mime type mappings
|
||||||
|
|
||||||
2006-02-19 Jan Schmidt <thaytan@mad.scientist.com>
|
2006-02-19 Jan Schmidt <thaytan@mad.scientist.com>
|
||||||
|
|
||||||
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
|
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
|
||||||
|
|
|
@ -558,6 +558,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
||||||
case CODEC_ID_MP3ADU:
|
case CODEC_ID_MP3ADU:
|
||||||
case CODEC_ID_MP3ON4:
|
case CODEC_ID_MP3ON4:
|
||||||
case CODEC_ID_WESTWOOD_SND1:
|
case CODEC_ID_WESTWOOD_SND1:
|
||||||
|
case CODEC_ID_CSCD:
|
||||||
|
case CODEC_ID_MMVIDEO:
|
||||||
|
case CODEC_ID_ZMBV:
|
||||||
|
case CODEC_ID_AVS:
|
||||||
|
case CODEC_ID_TRUESPEECH:
|
||||||
buildcaps = TRUE;
|
buildcaps = TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -813,7 +818,16 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
||||||
case CODEC_ID_DVB_SUBTITLE:
|
case CODEC_ID_DVB_SUBTITLE:
|
||||||
caps = NULL;
|
caps = NULL;
|
||||||
break;
|
break;
|
||||||
|
case CODEC_ID_BMP:
|
||||||
|
caps = gst_caps_new_simple ("image/bmp", NULL);
|
||||||
|
break;
|
||||||
|
case CODEC_ID_TTA:
|
||||||
|
caps = GST_FF_AUD_CAPS_NEW ("audio/x-tta", NULL);
|
||||||
|
if (context) {
|
||||||
|
gst_caps_set_simple (caps,
|
||||||
|
"samplesize", G_TYPE_INT, context->bits_per_sample, NULL);
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
g_warning ("Unknown codec ID %d, please add here", codec_id);
|
g_warning ("Unknown codec ID %d, please add here", codec_id);
|
||||||
break;
|
break;
|
||||||
|
@ -1471,6 +1485,13 @@ gst_ffmpeg_formatid_to_caps (const gchar * format_name)
|
||||||
caps = gst_caps_new_simple ("video/x-fli", NULL);
|
caps = gst_caps_new_simple ("video/x-fli", NULL);
|
||||||
} else if (!strcmp (format_name, "flv")) {
|
} else if (!strcmp (format_name, "flv")) {
|
||||||
caps = gst_caps_new_simple ("video/x-flv", NULL);
|
caps = gst_caps_new_simple ("video/x-flv", NULL);
|
||||||
|
} else if (!strcmp (format_name, "tta")) {
|
||||||
|
caps = gst_caps_new_simple ("audio/x-ttafile", NULL);
|
||||||
|
} else if (!strcmp (format_name, "aiff")) {
|
||||||
|
caps = gst_caps_new_simple ("audio/x-aiff", NULL);
|
||||||
|
} else if (!strcmp (format_name, "mov_mp4_m4a_3gp_3g2")) {
|
||||||
|
caps = gst_caps_from_string (
|
||||||
|
"application/x-3gp; video/quicktime; audio/x-m4a");
|
||||||
} else {
|
} else {
|
||||||
gchar *name;
|
gchar *name;
|
||||||
|
|
||||||
|
@ -2376,6 +2397,27 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
|
||||||
case CODEC_ID_FRAPS:
|
case CODEC_ID_FRAPS:
|
||||||
name = "FRAPS video";
|
name = "FRAPS video";
|
||||||
break;
|
break;
|
||||||
|
case CODEC_ID_BMP:
|
||||||
|
name = "BMP bitmap";
|
||||||
|
break;
|
||||||
|
case CODEC_ID_CSCD:
|
||||||
|
name = "CamStudio video";
|
||||||
|
break;
|
||||||
|
case CODEC_ID_MMVIDEO:
|
||||||
|
name = "American Laser Games MM Video";
|
||||||
|
break;
|
||||||
|
case CODEC_ID_ZMBV:
|
||||||
|
name = "Zip Motion Blocks Video";
|
||||||
|
break;
|
||||||
|
case CODEC_ID_AVS:
|
||||||
|
name = "AVS Video";
|
||||||
|
break;
|
||||||
|
case CODEC_ID_TTA:
|
||||||
|
name = "Lossless True Audio";
|
||||||
|
break;
|
||||||
|
case CODEC_ID_TRUESPEECH:
|
||||||
|
name = "DSP Group TrueSpeech Audio";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
GST_WARNING ("Unknown codecID 0x%x", codec_id);
|
GST_WARNING ("Unknown codecID 0x%x", codec_id);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1066,6 +1066,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
|
||||||
!strcmp (in_plugin->name, "mpeg") ||
|
!strcmp (in_plugin->name, "mpeg") ||
|
||||||
!strcmp (in_plugin->name, "wav") ||
|
!strcmp (in_plugin->name, "wav") ||
|
||||||
!strcmp (in_plugin->name, "au") ||
|
!strcmp (in_plugin->name, "au") ||
|
||||||
|
!strcmp (in_plugin->name, "tta") ||
|
||||||
!strcmp (in_plugin->name, "rm"))
|
!strcmp (in_plugin->name, "rm"))
|
||||||
register_typefind_func = FALSE;
|
register_typefind_func = FALSE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue