mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegcodecmap.c: Activate "amr" and "3gp" muxers.

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_get_codecids):
Activate "amr" and "3gp" muxers.
Add AMR-NB as a valid audio codec for "mp4" muxer
This commit is contained in:
Edward Hervey 2006-12-07 18:07:32 +00:00
parent c9e71601c5
commit d524eefabb
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-12-07 Edward Hervey <edward@fluendo.com>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_get_codecids):
Activate "amr" and "3gp" muxers.
Add AMR-NB as a valid audio codec for "mp4" muxer
2006-12-07 Wim Taymans <wim@fluendo.com> 2006-12-07 Wim Taymans <wim@fluendo.com>
* ext/ffmpeg/gstffmpegcodecmap.c: * ext/ffmpeg/gstffmpegcodecmap.c:

30
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -1717,8 +1717,13 @@ gst_ffmpeg_formatid_get_codecids (const gchar *format_name,
GST_LOG ("format_name : %s", format_name); GST_LOG ("format_name : %s", format_name);
if (!strcmp (format_name, "mp4")) { if (!strcmp (format_name, "mp4")) {
static enum CodecID mp4_video_list[] = { CODEC_ID_MPEG4, CODEC_ID_H264, CODEC_ID_NONE }; static enum CodecID mp4_video_list[] = {
static enum CodecID mp4_audio_list[] = { CODEC_ID_AAC, CODEC_ID_NONE }; CODEC_ID_MPEG4, CODEC_ID_H264, CODEC_ID_NONE
};
static enum CodecID mp4_audio_list[] = {
CODEC_ID_AAC, CODEC_ID_MP3, CODEC_ID_AMR_NB,
CODEC_ID_NONE
};
*video_codec_list = mp4_video_list; *video_codec_list = mp4_video_list;
*audio_codec_list = mp4_audio_list; *audio_codec_list = mp4_audio_list;
@ -1789,12 +1794,31 @@ gst_ffmpeg_formatid_get_codecids (const gchar *format_name,
*video_codec_list = mov_video_list; *video_codec_list = mov_video_list;
*audio_codec_list = mov_audio_list; *audio_codec_list = mov_audio_list;
} else if ((!strcmp (format_name, "3gp") ||
!strcmp (format_name, "3g2"))) {
static enum CodecID tgp_video_list[] = {
CODEC_ID_H263,
CODEC_ID_NONE
};
static enum CodecID tgp_audio_list[] = {
CODEC_ID_AMR_NB,
CODEC_ID_NONE
};
*video_codec_list = tgp_video_list;
*audio_codec_list = tgp_audio_list;
} else if (!strcmp (format_name, "mmf")) { } else if (!strcmp (format_name, "mmf")) {
static enum CodecID mmf_audio_list[] = { static enum CodecID mmf_audio_list[] = {
CODEC_ID_ADPCM_YAMAHA}; CODEC_ID_ADPCM_YAMAHA};
*video_codec_list = NULL; *video_codec_list = NULL;
*audio_codec_list = mmf_audio_list; *audio_codec_list = mmf_audio_list;
} else { } else if (!strcmp (format_name, "amr")) {
static enum CodecID amr_audio_list[] = {
CODEC_ID_AMR_NB, CODEC_ID_AMR_WB,
CODEC_ID_NONE };
*video_codec_list = NULL;
*audio_codec_list = amr_audio_list;
} else {
GST_LOG ("Format %s not found", format_name); GST_LOG ("Format %s not found", format_name);
return FALSE; return FALSE;
} }