mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

voaacenc: Add profile and level to the caps

Browse source 
Fixes bug #650595.
This commit is contained in:
Sebastian Dröge 2011-05-27 10:31:07 +02:00
parent 6702de4237
commit e3eabb6e6a
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/voaacenc/Makefile.am
View file

@ -12,6 +12,7 @@ libgstvoaacenc_la_CFLAGS = \
libgstvoaacenc_la_LIBADD = \ libgstvoaacenc_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR) \ -lgstaudio-$(GST_MAJORMINOR) \
-lgstpbutils-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(VOAACENC_LIBS) $(VOAACENC_LIBS)

15
ext/voaacenc/gstvoaacenc.c
View file

@ -38,6 +38,7 @@
#include <string.h> #include <string.h>
#include <gst/audio/multichannel.h> #include <gst/audio/multichannel.h>
#include <gst/pbutils/codec-utils.h>
#include "gstvoaacenc.h" #include "gstvoaacenc.h"
@ -70,7 +71,8 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("audio/mpeg, " GST_STATIC_CAPS ("audio/mpeg, "
"mpegversion = (int) 4, " "mpegversion = (int) 4, "
"rate = (int) [8000, 96000], " "rate = (int) [8000, 96000], "
"channels = (int) [1, 6], " "stream-format = (string) { adts, raw } ") "channels = (int) [1, 6], "
"stream-format = (string) { adts, raw }, " "base-profile = (string) lc")
); );
GST_DEBUG_CATEGORY_STATIC (gst_voaacenc_debug); GST_DEBUG_CATEGORY_STATIC (gst_voaacenc_debug);
@ -517,8 +519,13 @@ gst_voaacenc_create_source_pad_caps (GstVoAacEnc * voaacenc)
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstBuffer *codec_data; GstBuffer *codec_data;
gint index; gint index;
guint8 data[VOAAC_ENC_CODECDATA_LEN];
if ((index = voaacenc_get_rate_index (voaacenc->rate)) >= 0) { if ((index = voaacenc_get_rate_index (voaacenc->rate)) >= 0) {
/* LC profile only */
data[0] = ((0x02 << 3) | (index >> 1));
data[1] = ((index & 0x01) << 7) | (voaacenc->channels << 3);
caps = gst_caps_new_simple ("audio/mpeg", caps = gst_caps_new_simple ("audio/mpeg",
"mpegversion", G_TYPE_INT, VOAAC_ENC_MPEGVERSION, "mpegversion", G_TYPE_INT, VOAAC_ENC_MPEGVERSION,
"channels", G_TYPE_INT, voaacenc->channels, "channels", G_TYPE_INT, voaacenc->channels,
@ -527,12 +534,12 @@ gst_voaacenc_create_source_pad_caps (GstVoAacEnc * voaacenc)
(voaacenc->output_format ? "adts" : "raw") (voaacenc->output_format ? "adts" : "raw")
, NULL); , NULL);
gst_codec_utils_aac_caps_set_level_and_profile (caps, data, sizeof (data));
if (!voaacenc->output_format) { if (!voaacenc->output_format) {
codec_data = gst_buffer_new_and_alloc (VOAAC_ENC_CODECDATA_LEN); codec_data = gst_buffer_new_and_alloc (VOAAC_ENC_CODECDATA_LEN);
GST_BUFFER_DATA (codec_data)[0] = ((0x02 << 3) | (index >> 1)); memcpy (GST_BUFFER_DATA (codec_data), data, sizeof (data));
GST_BUFFER_DATA (codec_data)[1] =
((index & 0x01) << 7) | (voaacenc->channels << 3);
gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, codec_data, gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, codec_data,
NULL); NULL);