#include "gstdtsdec.h"
+#include <liboil/liboil.h>
+#include <liboil/liboilcpu.h>
+#include <liboil/liboilfunction.h>
+
GST_DEBUG_CATEGORY_STATIC (dtsdec_debug);
#define GST_CAT_DEFAULT (dtsdec_debug)
#if defined(LIBDTS_FIXED)
#define DTS_CAPS "audio/x-raw-int, " \
- "endianness = (int) BYTE_ORDER, " \
+ "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " \
"signed = (boolean) true, " \
"width = (int) 16, " \
"depth = (int) 16"
#define SAMPLE_WIDTH 16
#elif defined(LIBDTS_DOUBLE)
#define DTS_CAPS "audio/x-raw-float, " \
- "endianness = (int) BYTE_ORDER, " \
+ "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " \
"width = (int) 64"
#define SAMPLE_WIDTH 64
#else
#define DTS_CAPS "audio/x-raw-float, " \
- "endianness = (int) BYTE_ORDER, " \
+ "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " \
"width = (int) 32"
#define SAMPLE_WIDTH 32
#endif
"rate = (int) [ 4000, 96000 ], " "channels = (int) [ 1, 6 ]")
);
-static void gst_dtsdec_base_init (GstDtsDecClass * klass);
-static void gst_dtsdec_class_init (GstDtsDecClass * klass);
-static void gst_dtsdec_init (GstDtsDec * dtsdec);
+GST_BOILERPLATE (GstDtsDec, gst_dtsdec, GstElement, GST_TYPE_ELEMENT);
-static void gst_dtsdec_chain (GstPad * pad, GstData * data);
+static gboolean gst_dtsdec_sink_event (GstPad * pad, GstEvent * event);
+static GstFlowReturn gst_dtsdec_chain (GstPad * pad, GstBuffer * buf);
static GstStateChangeReturn gst_dtsdec_change_state (GstElement * element,
GstStateChange transition);
static void gst_dtsdec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
-static GstElementClass *parent_class = NULL;
-
-/* static guint gst_dtsdec_signals[LAST_SIGNAL] = { 0 }; */
-
-GType
-gst_dtsdec_get_type (void)
-{
- static GType dtsdec_type = 0;
-
- if (!dtsdec_type) {
- static const GTypeInfo dtsdec_info = {
- sizeof (GstDtsDecClass),
- (GBaseInitFunc) gst_dtsdec_base_init,
- NULL, (GClassInitFunc) gst_dtsdec_class_init,
- NULL,
- NULL,
- sizeof (GstDtsDec),
- 0,
- (GInstanceInitFunc) gst_dtsdec_init,
- };
-
- dtsdec_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstDtsDec", &dtsdec_info, 0);
-
- GST_DEBUG_CATEGORY_INIT (dtsdec_debug, "dtsdec", 0, "DTS audio decoder");
- }
- return dtsdec_type;
-}
static void
-gst_dtsdec_base_init (GstDtsDecClass * klass)
+gst_dtsdec_base_init (gpointer g_class)
{
- GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+ GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
static GstElementDetails gst_dtsdec_details = {
"DTS audio decoder",
"Codec/Decoder/Audio",
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_factory));
gst_element_class_set_details (element_class, &gst_dtsdec_details);
+
+ GST_DEBUG_CATEGORY_INIT (dtsdec_debug, "dtsdec", 0, "DTS audio decoder");
}
static void
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
+ guint cpuflags;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+ gobject_class->set_property = gst_dtsdec_set_property;
+ gobject_class->get_property = gst_dtsdec_get_property;
+
+ gstelement_class->change_state = gst_dtsdec_change_state;
+
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DRC,
g_param_spec_boolean ("drc", "Dynamic Range Compression",
"Use Dynamic Range Compression", FALSE, G_PARAM_READWRITE));
- gobject_class->set_property = gst_dtsdec_set_property;
- gobject_class->get_property = gst_dtsdec_get_property;
+ oil_init ();
- gstelement_class->change_state = gst_dtsdec_change_state;
+ klass->dts_cpuflags = 0;
+ cpuflags = oil_cpu_get_flags ();
+ if (cpuflags & OIL_IMPL_FLAG_MMX)
+ klass->dts_cpuflags |= MM_ACCEL_X86_MMX;
+ if (cpuflags & OIL_IMPL_FLAG_3DNOW)
+ klass->dts_cpuflags |= MM_ACCEL_X86_3DNOW;
+ if (cpuflags & OIL_IMPL_FLAG_MMXEXT)
+ klass->dts_cpuflags |= MM_ACCEL_X86_MMXEXT;
+
+ GST_LOG ("CPU flags: dts=%08x, liboil=%08x", klass->dts_cpuflags, cpuflags);
}
static void
-gst_dtsdec_init (GstDtsDec * dtsdec)
+gst_dtsdec_init (GstDtsDec * dtsdec, GstDtsDecClass * g_class)
{
- GstElement *element = GST_ELEMENT (dtsdec);
-
/* create the sink and src pads */
dtsdec->sinkpad =
- gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT
- (dtsdec), "sink"), "sink");
+ gst_pad_new_from_template (gst_static_pad_template_get
+ (&sink_factory), "sink");
gst_pad_set_chain_function (dtsdec->sinkpad, gst_dtsdec_chain);
- gst_element_add_pad (element, dtsdec->sinkpad);
+ gst_pad_set_event_function (dtsdec->sinkpad,
+ GST_DEBUG_FUNCPTR (gst_dtsdec_sink_event));
+ gst_element_add_pad (GST_ELEMENT (dtsdec), dtsdec->sinkpad);
dtsdec->srcpad =
- gst_pad_new_from_template (gst_element_get_pad_template (element,
- "src"), "src");
- gst_pad_use_explicit_caps (dtsdec->srcpad);
- gst_element_add_pad (element, dtsdec->srcpad);
+ gst_pad_new_from_template (gst_static_pad_template_get
+ (&src_factory), "src");
+ gst_pad_use_fixed_caps (dtsdec->srcpad);
+ gst_element_add_pad (GST_ELEMENT (dtsdec), dtsdec->srcpad);
- GST_OBJECT_FLAG_SET (element, GST_ELEMENT_EVENT_AWARE);
dtsdec->dynamic_range_compression = FALSE;
}
}
break;
default:
- /* error */
g_warning ("dtsdec: invalid flags 0x%x", flags);
return 0;
}
GstAudioChannelPosition *pos;
GstCaps *caps = gst_caps_from_string (DTS_CAPS);
gint channels = gst_dtsdec_channels (dts->using_channels, &pos);
+ gboolean result = FALSE;
if (!channels)
- return FALSE;
+ goto done;
GST_INFO ("dtsdec renegotiate, channels=%d, rate=%d",
channels, dts->sample_rate);
gst_audio_set_channel_positions (gst_caps_get_structure (caps, 0), pos);
g_free (pos);
- return gst_pad_set_explicit_caps (dts->srcpad, caps);
+ if (!gst_pad_set_caps (dts->srcpad, caps))
+ goto done;
+
+ result = TRUE;
+
+done:
+ if (caps) {
+ gst_caps_unref (caps);
+ }
+ return result;
}
-static void
-gst_dtsdec_handle_event (GstDtsDec * dts, GstEvent * event)
+static gboolean
+gst_dtsdec_sink_event (GstPad * pad, GstEvent * event)
{
- if (!event) {
- GST_ELEMENT_ERROR (dts, RESOURCE, READ, (NULL), (NULL));
- return;
- }
+ GstDtsDec *dtsdec = GST_DTSDEC (gst_pad_get_parent (pad));
+ gboolean ret = FALSE;
GST_LOG ("Handling event of type %d timestamp %llu", GST_EVENT_TYPE (event),
GST_EVENT_TIMESTAMP (event));
switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_DISCONTINUOUS:
- {
+ case GST_EVENT_NEWSEGMENT:{
+ GstFormat format;
gint64 val;
- if (!gst_event_discont_get_value (event, GST_FORMAT_TIME, &val) ||
- !GST_CLOCK_TIME_IS_VALID (val)) {
- GST_WARNING ("No time discont value in event %p", event);
+ gst_event_parse_new_segment (event, NULL, NULL, &format, &val, NULL,
+ NULL);
+ if (format != GST_FORMAT_TIME || !GST_CLOCK_TIME_IS_VALID (val)) {
+ GST_WARNING ("No time in newsegment event %p", event);
} else {
- dts->current_ts = val;
+ dtsdec->current_ts = val;
+ }
+
+ if (dtsdec->cache) {
+ gst_buffer_unref (dtsdec->cache);
+ dtsdec->cache = NULL;
}
+ ret = gst_pad_event_default (pad, event);
+ break;
}
- /* Fallthrough */
- case GST_EVENT_FLUSH:
- if (dts->cache) {
- gst_buffer_unref (dts->cache);
- dts->cache = NULL;
+ case GST_EVENT_TAG:
+ case GST_EVENT_EOS:{
+ ret = gst_pad_event_default (pad, event);
+ break;
+ }
+ case GST_EVENT_FLUSH_START:
+ ret = gst_pad_event_default (pad, event);
+ break;
+ case GST_EVENT_FLUSH_STOP:
+ if (dtsdec->cache) {
+ gst_buffer_unref (dtsdec->cache);
+ dtsdec->cache = NULL;
}
+ ret = gst_pad_event_default (pad, event);
break;
default:
+ ret = gst_pad_event_default (pad, event);
break;
}
- gst_pad_event_default (dts->sinkpad, event);
+ gst_object_unref (dtsdec);
+ return ret;
}
static void
gst_tag_list_add (taglist, GST_TAG_MERGE_APPEND,
GST_TAG_BITRATE, (guint) dts->bit_rate, NULL);
- gst_element_found_tags_for_pad (GST_ELEMENT (dts),
- dts->srcpad, dts->current_ts, taglist);
+ gst_element_found_tags_for_pad (GST_ELEMENT (dts), dts->srcpad, taglist);
}
-static gboolean
+static GstFlowReturn
gst_dtsdec_handle_frame (GstDtsDec * dts, guint8 * data,
guint length, gint flags, gint sample_rate, gint bit_rate)
{
gboolean need_renegotiation = FALSE;
- GstClockTime timestamp = 0;
gint channels, num_blocks;
GstBuffer *out;
gint i, s, c, num_c;
sample_t *samples;
+ GstFlowReturn result = GST_FLOW_OK;
/* go over stream properties, update caps/streaminfo if needed */
if (dts->sample_rate != sample_rate) {
if (dts_frame (dts->state, data, &flags, &dts->level, dts->bias)) {
GST_WARNING ("dts_frame error");
- return FALSE;
+ return GST_FLOW_OK;
}
channels = flags & (DTS_CHANNEL_MASK | DTS_LFE);
if (need_renegotiation == TRUE) {
GST_DEBUG ("dtsdec: sample_rate:%d stream_chans:0x%x using_chans:0x%x",
dts->sample_rate, dts->stream_channels, dts->using_channels);
- if (!gst_dtsdec_renegotiate (dts))
- return FALSE;
+ if (!gst_dtsdec_renegotiate (dts)) {
+ GST_ELEMENT_ERROR (dts, CORE, NEGOTIATION, (NULL), (NULL));
+ return GST_FLOW_ERROR;
+ }
}
if (dts->dynamic_range_compression == FALSE) {
samples = dts_samples (dts->state);
num_c = gst_dtsdec_channels (dts->using_channels, NULL);
- out = gst_buffer_new_and_alloc ((SAMPLE_WIDTH / 8) * 256 * num_c);
- if (!out) {
+
+ result = gst_pad_alloc_buffer_and_set_caps (dts->srcpad, 0,
+ (SAMPLE_WIDTH / 8) * 256 * num_c, GST_PAD_CAPS (dts->srcpad), &out);
+
+ if (result != GST_FLOW_OK) {
GST_ELEMENT_ERROR (dts, RESOURCE, FAILED, (NULL), ("Out of memory"));
- return FALSE;
+ goto done;
}
- GST_BUFFER_TIMESTAMP (out) = timestamp;
+ GST_BUFFER_TIMESTAMP (out) = dts->current_ts;
GST_BUFFER_DURATION (out) = GST_SECOND * 256 / dts->sample_rate;
+ dts->current_ts += GST_BUFFER_DURATION (out);
/* libdts returns buffers in 256-sample-blocks per channel,
* we want interleaved. And we need to copy anyway... */
}
/* push on */
- gst_pad_push (dts->srcpad, GST_DATA (out));
- timestamp += GST_SECOND * 256 / dts->sample_rate;
+ result = gst_pad_push (dts->srcpad, out);
+
+ if (result != GST_FLOW_OK) {
+ gst_buffer_unref (out);
+ goto done;
+ }
+
+
}
- dts->current_ts = timestamp;
- return TRUE;
+done:
+
+ return result;
}
-static void
-gst_dtsdec_chain (GstPad * pad, GstData * _data)
+static GstFlowReturn
+gst_dtsdec_chain (GstPad * pad, GstBuffer * buf)
{
GstDtsDec *dts;
guint8 *data;
gint64 size;
- GstBuffer *buf;
gint length, flags, sample_rate, bit_rate, frame_length;
-
- g_return_if_fail (pad != NULL);
- g_return_if_fail (_data != NULL);
+ GstFlowReturn result = GST_FLOW_OK;
dts = GST_DTSDEC (gst_pad_get_parent (pad));
- if (GST_IS_EVENT (_data)) {
- gst_dtsdec_handle_event (dts, GST_EVENT (_data));
- return;
- }
-
- /* merge with cache, if any. Also make sure timestamps match */
- buf = GST_BUFFER (_data);
- if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
- dts->current_ts = GST_BUFFER_TIMESTAMP (buf);
- GST_DEBUG_OBJECT (dts, "Received buffer with ts %" GST_TIME_FORMAT
- " duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
- GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
- }
-
if (dts->cache) {
buf = gst_buffer_join (dts->cache, buf);
dts->cache = NULL;
size--;
} else if (length <= size) {
GST_DEBUG ("Sync: frame size %d", length);
- if (!gst_dtsdec_handle_frame (dts, data,
- length, flags, sample_rate, bit_rate)) {
+ result = gst_dtsdec_handle_frame (dts, data, length,
+ flags, sample_rate, bit_rate);
+ if (result != GST_FLOW_OK) {
size = 0;
break;
}
}
gst_buffer_unref (buf);
+ gst_object_unref (dts);
+
+ return result;
}
static GstStateChangeReturn
gst_dtsdec_change_state (GstElement * element, GstStateChange transition)
{
+ GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
GstDtsDec *dts = GST_DTSDEC (element);
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:{
- GstCPUFlags cpuflags;
- uint32_t mm_accel = 0;
-
- cpuflags = gst_cpu_get_flags ();
- if (cpuflags & GST_CPU_FLAG_MMX)
- mm_accel |= MM_ACCEL_X86_MMX;
- if (cpuflags & GST_CPU_FLAG_3DNOW)
- mm_accel |= MM_ACCEL_X86_3DNOW;
- if (cpuflags & GST_CPU_FLAG_MMXEXT)
- mm_accel |= MM_ACCEL_X86_MMXEXT;
-
- dts->state = dts_init (mm_accel);
+ GstDtsDecClass *klass;
+
+ klass = GST_DTSDEC_CLASS (G_OBJECT_GET_CLASS (dts));
+ dts->state = dts_init (klass->dts_cpuflags);
break;
}
case GST_STATE_CHANGE_READY_TO_PAUSED:
dts->bias = 0;
dts->current_ts = 0;
break;
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+ break;
+ default:
+ break;
+ }
+
+ ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+ switch (transition) {
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+ break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
dts->samples = NULL;
+ if (dts->cache) {
+ gst_buffer_unref (dts->cache);
+ dts->cache = NULL;
+ }
break;
case GST_STATE_CHANGE_READY_TO_NULL:
dts_free (dts->state);
break;
}
- if (GST_ELEMENT_CLASS (parent_class)->change_state)
- return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
- return GST_STATE_CHANGE_SUCCESS;
+ return ret;
}
static void
static gboolean
plugin_init (GstPlugin * plugin)
{
- if (!gst_library_load ("gstbytestream") || !gst_library_load ("gstaudio"))
- return FALSE;
-
if (!gst_element_register (plugin, "dtsdec", GST_RANK_PRIMARY,
GST_TYPE_DTSDEC))
return FALSE;
projects / platform / upstream / gstreamer.git / commitdiff