mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 00:06:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

avcodecmap: Take generic samplerate limitations into account

Browse source
This commit is contained in:
Sebastian Dröge 2012-12-11 16:54:09 +00:00
parent 90e1c0c21d
commit b9d0c7110f
1 changed files with 116 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
ext/libav/gstavcodecmap.c
View file

@ -282,8 +282,9 @@ gst_ff_vid_caps_new (AVCodecContext * context, enum CodecID codec_id,
/* same for audio - now with channels/sample rate /* same for audio - now with channels/sample rate
*/ */
static GstCaps * static GstCaps *
gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id, gst_ff_aud_caps_new (AVCodecContext * context, AVCodec * codec,
gboolean encode, const char *mimetype, const char *fieldname, ...) enum CodecID codec_id, gboolean encode, const char *mimetype,
const char *fieldname, ...)
{ {
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstStructure *structure = NULL; GstStructure *structure = NULL;
@ -424,8 +425,32 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_set_value (structure, "rate", &list); gst_structure_set_value (structure, "rate", &list);
g_value_unset (&list); g_value_unset (&list);
} else } else if (codec && codec->supported_samplerates
&& codec->supported_samplerates[0]) {
GValue va = { 0, };
GValue v = { 0, };
if (!codec->supported_samplerates[1]) {
gst_caps_set_simple (caps, "rate", G_TYPE_INT,
codec->supported_samplerates[0], NULL);
} else {
const int *rates = codec->supported_samplerates;
g_value_init (&va, GST_TYPE_LIST);
g_value_init (&v, G_TYPE_INT);
while (*rates) {
g_value_set_int (&v, *rates);
gst_value_list_append_value (&va, &v);
rates++;
}
gst_caps_set_value (caps, "rate", &va);
g_value_unset (&va);
g_value_unset (&v);
}
} else {
gst_caps_set_simple (caps, "rate", GST_TYPE_INT_RANGE, 4000, 96000, NULL); gst_caps_set_simple (caps, "rate", GST_TYPE_INT_RANGE, 4000, 96000, NULL);
}
} else { } else {
caps = gst_caps_new_empty_simple (mimetype); caps = gst_caps_new_empty_simple (mimetype);
} }
@ -573,20 +598,21 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_MP1: case CODEC_ID_MP1:
/* FIXME: bitrate */ /* FIXME: bitrate */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/mpeg", caps = gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/mpeg",
"mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 1, NULL); "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 1, NULL);
break; break;
case CODEC_ID_MP2: case CODEC_ID_MP2:
/* FIXME: bitrate */ /* FIXME: bitrate */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/mpeg", caps = gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/mpeg",
"mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 2, NULL); "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 2, NULL);
break; break;
case CODEC_ID_MP3: case CODEC_ID_MP3:
if (encode) { if (encode) {
/* FIXME: bitrate */ /* FIXME: bitrate */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/mpeg", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/mpeg",
"mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 3, NULL); "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 3, NULL);
} else { } else {
/* Decodes MPEG-1 layer 1/2/3. Samplerate, channels et al are /* Decodes MPEG-1 layer 1/2/3. Samplerate, channels et al are
@ -599,14 +625,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_MUSEPACK7: case CODEC_ID_MUSEPACK7:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, gst_ff_aud_caps_new (context, NULL, codec_id, encode,
"audio/x-ffmpeg-parsed-musepack", "streamversion", G_TYPE_INT, 7, "audio/x-ffmpeg-parsed-musepack", "streamversion", G_TYPE_INT, 7,
NULL); NULL);
break; break;
case CODEC_ID_MUSEPACK8: case CODEC_ID_MUSEPACK8:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, gst_ff_aud_caps_new (context, NULL, codec_id, encode,
"audio/x-ffmpeg-parsed-musepack", "streamversion", G_TYPE_INT, 8, "audio/x-ffmpeg-parsed-musepack", "streamversion", G_TYPE_INT, 8,
NULL); NULL);
break; break;
@ -614,41 +640,44 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_AC3: case CODEC_ID_AC3:
/* FIXME: bitrate */ /* FIXME: bitrate */
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-ac3", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-ac3",
NULL);
break; break;
case CODEC_ID_EAC3: case CODEC_ID_EAC3:
/* FIXME: bitrate */ /* FIXME: bitrate */
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-eac3", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-eac3",
NULL);
break; break;
case CODEC_ID_TRUEHD: case CODEC_ID_TRUEHD:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-true-hd", gst_ff_aud_caps_new (context, NULL, codec_id, encode,
NULL); "audio/x-true-hd", NULL);
break; break;
case CODEC_ID_ATRAC1: case CODEC_ID_ATRAC1:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, gst_ff_aud_caps_new (context, NULL, codec_id, encode,
"audio/x-vnd.sony.atrac1", NULL); "audio/x-vnd.sony.atrac1", NULL);
break; break;
case CODEC_ID_ATRAC3: case CODEC_ID_ATRAC3:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, gst_ff_aud_caps_new (context, NULL, codec_id, encode,
"audio/x-vnd.sony.atrac3", NULL); "audio/x-vnd.sony.atrac3", NULL);
break; break;
case CODEC_ID_DTS: case CODEC_ID_DTS:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-dts", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-dts",
NULL);
break; break;
case CODEC_ID_APE: case CODEC_ID_APE:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, gst_ff_aud_caps_new (context, NULL, codec_id, encode,
"audio/x-ffmpeg-parsed-ape", NULL); "audio/x-ffmpeg-parsed-ape", NULL);
if (context) { if (context) {
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
@ -658,12 +687,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_MLP: case CODEC_ID_MLP:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-mlp", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-mlp",
NULL);
break; break;
case CODEC_ID_IMC: case CODEC_ID_IMC:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-imc", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-imc",
NULL);
break; break;
/* MJPEG is normal JPEG, Motion-JPEG and Quicktime MJPEG-A. MJPEGB /* MJPEG is normal JPEG, Motion-JPEG and Quicktime MJPEG-A. MJPEGB
@ -776,7 +807,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_DVAUDIO: case CODEC_ID_DVAUDIO:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-dv", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-dv",
NULL);
break; break;
case CODEC_ID_DVVIDEO: case CODEC_ID_DVVIDEO:
@ -826,21 +858,24 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
gint version = (codec_id == CODEC_ID_WMAV1) ? 1 : 2; gint version = (codec_id == CODEC_ID_WMAV1) ? 1 : 2;
if (context) { if (context) {
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-wma", caps =
"wmaversion", G_TYPE_INT, version, gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-wma",
"block_align", G_TYPE_INT, context->block_align, "wmaversion", G_TYPE_INT, version, "block_align", G_TYPE_INT,
"bitrate", G_TYPE_INT, context->bit_rate, NULL); context->block_align, "bitrate", G_TYPE_INT, context->bit_rate,
NULL);
} else { } else {
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-wma", caps =
"wmaversion", G_TYPE_INT, version, gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-wma",
"block_align", GST_TYPE_INT_RANGE, 0, G_MAXINT, "wmaversion", G_TYPE_INT, version, "block_align",
"bitrate", GST_TYPE_INT_RANGE, 0, G_MAXINT, NULL); GST_TYPE_INT_RANGE, 0, G_MAXINT, "bitrate", GST_TYPE_INT_RANGE, 0,
G_MAXINT, NULL);
} }
} }
break; break;
case CODEC_ID_WMAPRO: case CODEC_ID_WMAPRO:
{ {
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-wma", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-wma",
"wmaversion", G_TYPE_INT, 3, NULL); "wmaversion", G_TYPE_INT, 3, NULL);
break; break;
} }
@ -848,7 +883,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_WMAVOICE: case CODEC_ID_WMAVOICE:
{ {
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-wms", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-wms",
NULL);
break; break;
} }
@ -857,7 +893,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
{ {
gint version = (codec_id == CODEC_ID_MACE3) ? 3 : 6; gint version = (codec_id == CODEC_ID_MACE3) ? 3 : 6;
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-mace", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-mace",
"maceversion", G_TYPE_INT, version, NULL); "maceversion", G_TYPE_INT, version, NULL);
} }
break; break;
@ -951,7 +988,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_AAC: case CODEC_ID_AAC:
{ {
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/mpeg", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/mpeg",
NULL);
if (!encode) { if (!encode) {
GValue arr = { 0, }; GValue arr = { 0, };
@ -993,7 +1031,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
} }
case CODEC_ID_AAC_LATM: /* LATM/LOAS AAC syntax */ case CODEC_ID_AAC_LATM: /* LATM/LOAS AAC syntax */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/mpeg", caps = gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/mpeg",
"mpegversion", G_TYPE_INT, 4, "stream-format", G_TYPE_STRING, "loas", "mpegversion", G_TYPE_INT, 4, "stream-format", G_TYPE_STRING, "loas",
NULL); NULL);
break; break;
@ -1098,7 +1136,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
case CODEC_ID_QDM2: case CODEC_ID_QDM2:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-qdm2", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-qdm2",
NULL);
break; break;
case CODEC_ID_MSZH: case CODEC_ID_MSZH:
@ -1239,13 +1278,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_TRUESPEECH: case CODEC_ID_TRUESPEECH:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-truespeech", gst_ff_aud_caps_new (context, NULL, codec_id, encode,
NULL); "audio/x-truespeech", NULL);
break; break;
case CODEC_ID_QCELP: case CODEC_ID_QCELP:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/qcelp", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/qcelp",
NULL);
break; break;
case CODEC_ID_AMV: case CODEC_ID_AMV:
@ -1341,7 +1381,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
} }
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-raw", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-raw",
"format", G_TYPE_STRING, gst_audio_format_to_string (format), "format", G_TYPE_STRING, gst_audio_format_to_string (format),
"layout", G_TYPE_STRING, "interleaved", NULL); "layout", G_TYPE_STRING, "interleaved", NULL);
} }
@ -1349,18 +1390,20 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_PCM_MULAW: case CODEC_ID_PCM_MULAW:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-mulaw", gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-mulaw",
NULL); NULL);
break; break;
case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_ALAW:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-alaw", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-alaw",
NULL);
break; break;
case CODEC_ID_ADPCM_G722: case CODEC_ID_ADPCM_G722:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/G722", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/G722",
NULL);
if (context) if (context)
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
"block_align", G_TYPE_INT, context->block_align, "block_align", G_TYPE_INT, context->block_align,
@ -1370,7 +1413,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_ADPCM_G726: case CODEC_ID_ADPCM_G726:
{ {
/* the G726 decoder can also handle G721 */ /* the G726 decoder can also handle G721 */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-adpcm", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-adpcm",
"layout", G_TYPE_STRING, "g726", NULL); "layout", G_TYPE_STRING, "g726", NULL);
if (context) if (context)
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
@ -1503,7 +1547,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
/* FIXME: someone please check whether we need additional properties /* FIXME: someone please check whether we need additional properties
* in this caps definition. */ * in this caps definition. */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-adpcm", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-adpcm",
"layout", G_TYPE_STRING, layout, NULL); "layout", G_TYPE_STRING, layout, NULL);
if (context) if (context)
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
@ -1513,34 +1558,39 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
case CODEC_ID_AMR_NB: case CODEC_ID_AMR_NB:
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/AMR", NULL); caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/AMR",
NULL);
break; break;
case CODEC_ID_AMR_WB: case CODEC_ID_AMR_WB:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/AMR-WB", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/AMR-WB",
NULL);
break; break;
case CODEC_ID_GSM: case CODEC_ID_GSM:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-gsm", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-gsm",
NULL);
break; break;
case CODEC_ID_GSM_MS: case CODEC_ID_GSM_MS:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/ms-gsm", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/ms-gsm",
NULL);
break; break;
case CODEC_ID_NELLYMOSER: case CODEC_ID_NELLYMOSER:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-nellymoser", gst_ff_aud_caps_new (context, NULL, codec_id, encode,
NULL); "audio/x-nellymoser", NULL);
break; break;
case CODEC_ID_SIPR: case CODEC_ID_SIPR:
{ {
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-sipro", gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-sipro",
NULL); NULL);
if (context) { if (context) {
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
@ -1572,7 +1622,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
/* FIXME: properties? */ /* FIXME: properties? */
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, gst_ff_aud_caps_new (context, NULL, codec_id, encode,
"audio/x-pn-realaudio", "raversion", G_TYPE_INT, version, NULL); "audio/x-pn-realaudio", "raversion", G_TYPE_INT, version, NULL);
if (context) { if (context) {
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
@ -1609,7 +1659,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
/* FIXME: someone please check whether we need additional properties /* FIXME: someone please check whether we need additional properties
* in this caps definition. */ * in this caps definition. */
caps = gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-dpcm", caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-dpcm",
"layout", G_TYPE_STRING, layout, NULL); "layout", G_TYPE_STRING, layout, NULL);
if (context) if (context)
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
@ -1624,7 +1675,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_ALAC: case CODEC_ID_ALAC:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-alac", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-alac",
NULL);
if (context) { if (context) {
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
"samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL); "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL);
@ -1648,7 +1700,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
case CODEC_ID_TTA: case CODEC_ID_TTA:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-tta", NULL); gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-tta",
NULL);
if (context) { if (context) {
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
"samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL); "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL);
@ -1656,8 +1709,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
case CODEC_ID_TWINVQ: case CODEC_ID_TWINVQ:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, encode, "audio/x-twin-vq", gst_ff_aud_caps_new (context, NULL, codec_id, encode,
NULL); "audio/x-twin-vq", NULL);
break; break;
default: default:
GST_DEBUG ("Unknown codec ID %d, please add mapping here", codec_id); GST_DEBUG ("Unknown codec ID %d, please add mapping here", codec_id);
@ -1681,7 +1734,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
mime = g_strdup_printf ("audio/x-gst-av-%s", codec->name); mime = g_strdup_printf ("audio/x-gst-av-%s", codec->name);
caps = gst_ff_aud_caps_new (context, codec_id, encode, mime, NULL); caps =
gst_ff_aud_caps_new (context, NULL, codec_id, encode, mime, NULL);
if (context) if (context)
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
"block_align", G_TYPE_INT, context->block_align, "block_align", G_TYPE_INT, context->block_align,
@ -1784,7 +1838,7 @@ gst_ffmpeg_smpfmt_to_audioformat (enum AVSampleFormat sample_fmt)
static GstCaps * static GstCaps *
gst_ffmpeg_smpfmt_to_caps (enum AVSampleFormat sample_fmt, gst_ffmpeg_smpfmt_to_caps (enum AVSampleFormat sample_fmt,
AVCodecContext * context, enum CodecID codec_id) AVCodecContext * context, AVCodec * codec, enum CodecID codec_id)
{ {
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstAudioFormat format; GstAudioFormat format;
@ -1792,7 +1846,7 @@ gst_ffmpeg_smpfmt_to_caps (enum AVSampleFormat sample_fmt,
format = gst_ffmpeg_smpfmt_to_audioformat (sample_fmt); format = gst_ffmpeg_smpfmt_to_audioformat (sample_fmt);
if (format != GST_AUDIO_FORMAT_UNKNOWN) { if (format != GST_AUDIO_FORMAT_UNKNOWN) {
caps = gst_ff_aud_caps_new (context, codec_id, TRUE, "audio/x-raw", caps = gst_ff_aud_caps_new (context, codec, codec_id, TRUE, "audio/x-raw",
"format", G_TYPE_STRING, gst_audio_format_to_string (format), "format", G_TYPE_STRING, gst_audio_format_to_string (format),
"layout", G_TYPE_STRING, "interleaved", NULL); "layout", G_TYPE_STRING, "interleaved", NULL);
GST_LOG ("caps for sample_fmt=%d: %" GST_PTR_FORMAT, sample_fmt, caps); GST_LOG ("caps for sample_fmt=%d: %" GST_PTR_FORMAT, sample_fmt, caps);
@ -1862,9 +1916,11 @@ gst_ffmpeg_codectype_to_audio_caps (AVCodecContext * context,
if (context) { if (context) {
/* Specific codec context */ /* Specific codec context */
caps = gst_ffmpeg_smpfmt_to_caps (context->sample_fmt, context, codec_id); caps =
gst_ffmpeg_smpfmt_to_caps (context->sample_fmt, context, codec,
codec_id);
} else { } else {
caps = gst_ff_aud_caps_new (context, codec_id, TRUE, "audio/x-raw", caps = gst_ff_aud_caps_new (context, codec, codec_id, TRUE, "audio/x-raw",
"layout", G_TYPE_STRING, "interleaved", NULL); "layout", G_TYPE_STRING, "interleaved", NULL);
gst_ffmpeg_audio_set_sample_fmts (caps, codec ? codec->sample_fmts : NULL); gst_ffmpeg_audio_set_sample_fmts (caps, codec ? codec->sample_fmts : NULL);