FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Rename aac's stream-format 'none' to 'raw'

Browse Source 
Renames aac's stream-format from previous commits from none to
raw
This commit is contained in:
Thiago Santos 2010-01-11 13:13:41 -03:00
parent 01f514160f
commit a428ad82c7
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/faac/gstfaac.c
View File

@ -78,7 +78,7 @@
"mpegversion = (int) { 4, 2 }, " \ "mpegversion = (int) { 4, 2 }, " \
"channels = (int) [ 1, 6 ], " \ "channels = (int) [ 1, 6 ], " \
"rate = (int) [ 8000, 96000 ], " \ "rate = (int) [ 8000, 96000 ], " \
"stream-format = (string) { adts, none } " "stream-format = (string) { adts, raw } "
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
@ -499,7 +499,7 @@ gst_faac_configure_source_pad (GstFaac * faac)
"mpegversion", G_TYPE_INT, mpegversion, "mpegversion", G_TYPE_INT, mpegversion,
"channels", G_TYPE_INT, faac->channels, "channels", G_TYPE_INT, faac->channels,
"rate", G_TYPE_INT, faac->samplerate, "rate", G_TYPE_INT, faac->samplerate,
"stream-format", G_TYPE_STRING, (faac->outputformat ? "adts" : "none"), "stream-format", G_TYPE_STRING, (faac->outputformat ? "adts" : "raw"),
NULL); NULL);
if (!faac->outputformat) { if (!faac->outputformat) {

2
gst/audioparsers/gstaacparse.c
View File

@ -223,7 +223,7 @@ gst_aacparse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps)
switch (aacparse->header_type) { switch (aacparse->header_type) {
case DSPAAC_HEADER_NONE: case DSPAAC_HEADER_NONE:
stream_format = "none"; stream_format = "raw";
break; break;
case DSPAAC_HEADER_ADTS: case DSPAAC_HEADER_ADTS:
stream_format = "adts"; stream_format = "adts";

6
gst/qtmux/gstqtmux.c
View File

@ -1792,14 +1792,14 @@ gst_qt_mux_audio_sink_set_caps (GstPad * pad, GstCaps * caps)
/* check stream-format */ /* check stream-format */
stream_format = gst_structure_get_string (structure, "stream-format"); stream_format = gst_structure_get_string (structure, "stream-format");
if (stream_format) { if (stream_format) {
if (strcmp (stream_format, "none") != 0) { if (strcmp (stream_format, "raw") != 0) {
GST_WARNING_OBJECT (qtmux, "Unsupported AAC stream-format %s, " GST_WARNING_OBJECT (qtmux, "Unsupported AAC stream-format %s, "
"please use 'none'", stream_format); "please use 'raw'", stream_format);
goto refuse_caps; goto refuse_caps;
} }
} else { } else {
GST_WARNING_OBJECT (qtmux, "No stream-format present in caps, " GST_WARNING_OBJECT (qtmux, "No stream-format present in caps, "
"assuming 'none'"); "assuming 'raw'");
} }
if (!codec_data || GST_BUFFER_SIZE (codec_data) < 2) if (!codec_data || GST_BUFFER_SIZE (codec_data) < 2)

2
gst/qtmux/gstqtmuxmap.c
View File

@ -119,7 +119,7 @@
#define AAC_CAPS \ #define AAC_CAPS \
"audio/mpeg, " \ "audio/mpeg, " \
"mpegversion = (int) 4, " \ "mpegversion = (int) 4, " \
"stream-format = (string) none, " \ "stream-format = (string) raw, " \
COMMON_AUDIO_CAPS (8, MAX) COMMON_AUDIO_CAPS (8, MAX)
#define AMR_CAPS \ #define AMR_CAPS \

2
tests/check/elements/aacparse.c
View File

@ -473,7 +473,7 @@ GST_START_TEST (test_parse_handle_codec_data)
fail_unless (gst_structure_has_field (s, "codec_data")); fail_unless (gst_structure_has_field (s, "codec_data"));
fail_unless (gst_structure_has_field (s, "stream-format")); fail_unless (gst_structure_has_field (s, "stream-format"));
stream_format = gst_structure_get_string (s, "stream-format"); stream_format = gst_structure_get_string (s, "stream-format");
fail_unless (strcmp (stream_format, "none") == 0); fail_unless (strcmp (stream_format, "raw") == 0);
gst_caps_unref (sinkcaps); gst_caps_unref (sinkcaps);