From c92678bb20d9e9913810bcbe3c5000929a06f619 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 26 Oct 2003 12:10:01 +0000 Subject: [PATCH] Re-enable realaudio codecs, improve decoder naming and add mpeg2aac decoder... Now to find out why it still doesn't l... Original commit message from CVS: Re-enable realaudio codecs, improve decoder naming and add mpeg2aac decoder... Now to find out why it still doesn't list itself after gst-register'ing... --- ext/ffmpeg/gstffmpegcodecmap.c | 10 +++++++--- ext/ffmpeg/gstffmpegdec.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index c831dc6..0ec0c32 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -305,7 +305,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, break; case CODEC_ID_AAC: - /* .. */ + caps = GST_FF_AUD_CAPS_NEW ("ffmpeg_mpeg2aac", + "audio/mpeg", + "systemstream", GST_PROPS_BOOLEAN (FALSE), + "mpegversion", GST_PROPS_INT (2) + ); break; case CODEC_ID_MPEG4AAC: @@ -433,7 +437,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, /* .. */ break; - /*case CODEC_ID_RA_144: + case CODEC_ID_RA_144: caps = GST_FF_AUD_CAPS_NEW ("ffmpeg_realaudio_144", "audio/x-pn-realaudio", "bitrate", GST_PROPS_INT (14400) @@ -445,7 +449,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, "audio/x-pn-realaudio", "bitrate", GST_PROPS_INT (28800) ); - break;*/ + break; default: /* .. */ diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 267db5d..e3ee0f9 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -469,7 +469,7 @@ gst_ffmpegdec_register (GstPlugin *plugin) /* construct the element details struct */ details = g_new0 (GstElementDetails, 1); - details->longname = g_strdup(in_plugin->name); + details->longname = g_strdup_printf("FFMPEG %s decoder", in_plugin->name); details->klass = g_strdup_printf("Codec/%s/Decoder", (in_plugin->type == CODEC_TYPE_VIDEO) ? "Video" : "Audio"); -- 2.7.4