summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-07-20 12:40:28 +0100
committerTim-Philipp Müller <tim@centricular.com>2015-07-20 12:43:36 +0100
commitf8b7c38bedeecd6a3ef1f484f69eeec09bc93ba4 (patch)
tree94d2406fb632b9c0e9d87cfaaa9e33b3aefbc8fc /ext
parentbe22d8fb4af7d8c4c3443453fa407ce4eb3d37d6 (diff)
voaacenc: fix output caps for stream-format=ADTS
Should have framed=true in caps. Fixes voaacenc ! mpegtsmux.
Diffstat (limited to 'ext')
-rw-r--r--ext/voaacenc/gstvoaacenc.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/voaacenc/gstvoaacenc.c b/ext/voaacenc/gstvoaacenc.c
index a7fa26072..fb629f5da 100644
--- a/ext/voaacenc/gstvoaacenc.c
+++ b/ext/voaacenc/gstvoaacenc.c
@@ -376,18 +376,20 @@ gst_voaacenc_create_source_pad_caps (GstVoAacEnc * voaacenc)
caps = gst_caps_new_simple ("audio/mpeg",
"mpegversion", G_TYPE_INT, VOAAC_ENC_MPEGVERSION,
"channels", G_TYPE_INT, voaacenc->channels,
- "rate", G_TYPE_INT, voaacenc->rate,
- "stream-format", G_TYPE_STRING,
- (voaacenc->output_format ? "adts" : "raw")
- , NULL);
+ "rate", G_TYPE_INT, voaacenc->rate, NULL);
gst_codec_utils_aac_caps_set_level_and_profile (caps, map.data,
VOAAC_ENC_CODECDATA_LEN);
gst_buffer_unmap (codec_data, &map);
if (!voaacenc->output_format) {
- gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, codec_data,
- NULL);
+ gst_caps_set_simple (caps,
+ "stream-format", G_TYPE_STRING, "raw",
+ "codec_data", GST_TYPE_BUFFER, codec_data, NULL);
+ } else {
+ gst_caps_set_simple (caps,
+ "stream-format", G_TYPE_STRING, "adts",
+ "framed", G_TYPE_BOOLEAN, TRUE, NULL);
}
gst_buffer_unref (codec_data);
}