[MOVED FROM GST-P-FARSIGHT] Make GstSirenEnc use GST_*_OBJECT appropriately

20080704200029-3e2dc-f68fdaaa8929039fd8413ff0bf8ff514f6e4fbe1.gz
This commit is contained in:
Olivier Crete 2008-07-04 20:00:29 +00:00 committed by Edward Hervey
parent 8722c6e6f5
commit 1d94ecf2fd

View File

@ -140,11 +140,11 @@ static void
gst_siren_dec_init (GstSirenDec *dec, GstSirenDecClass *klass) gst_siren_dec_init (GstSirenDec *dec, GstSirenDecClass *klass)
{ {
GST_DEBUG ("Initializing"); GST_DEBUG_OBJECT (dec, "Initializing");
dec->decoder = NULL; dec->decoder = NULL;
dec->adapter = gst_adapter_new (); dec->adapter = gst_adapter_new ();
GST_DEBUG ("Init done"); GST_DEBUG_OBJECT (dec, "Init done");
} }
static void static void
@ -152,7 +152,7 @@ gst_siren_dec_dispose (GObject *object)
{ {
GstSirenDec *dec = GST_SIREN_DEC (object); GstSirenDec *dec = GST_SIREN_DEC (object);
GST_DEBUG ("Disposing"); GST_DEBUG_OBJECT (dec, "Disposing");
if (dec->decoder) { if (dec->decoder) {
Siren7_CloseDecoder (dec->decoder); Siren7_CloseDecoder (dec->decoder);
@ -164,9 +164,6 @@ gst_siren_dec_dispose (GObject *object)
} }
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
GST_DEBUG ("Dispose done");
} }
static gboolean static gboolean
@ -284,7 +281,7 @@ gst_siren_dec_transform (GstBaseTransform *trans, GstBuffer *inbuf,
gint offset = 0; gint offset = 0;
gint decode_ret = 0; gint decode_ret = 0;
GST_DEBUG ("Transform"); GST_LOG_OBJECT (dec, "Transform");
if (dec->decoder == NULL) { if (dec->decoder == NULL) {
GST_DEBUG ("Siren decoder not set"); GST_DEBUG ("Siren decoder not set");
@ -298,7 +295,7 @@ gst_siren_dec_transform (GstBaseTransform *trans, GstBuffer *inbuf,
gst_buffer_ref (inbuf); gst_buffer_ref (inbuf);
gst_adapter_push (dec->adapter, inbuf); gst_adapter_push (dec->adapter, inbuf);
GST_DEBUG ("Received buffer of size %d with adapter of size : %d", GST_LOG_OBJECT (dec,"Received buffer of size %d with adapter of size : %d",
GST_BUFFER_SIZE (inbuf), gst_adapter_available (dec->adapter)); GST_BUFFER_SIZE (inbuf), gst_adapter_available (dec->adapter));
data = GST_BUFFER_DATA (outbuf); data = GST_BUFFER_DATA (outbuf);
@ -313,7 +310,7 @@ gst_siren_dec_transform (GstBaseTransform *trans, GstBuffer *inbuf,
(guint8 *) gst_adapter_peek (dec->adapter, 40), (guint8 *) gst_adapter_peek (dec->adapter, 40),
data + offset); data + offset);
if (decode_ret != 0) { if (decode_ret != 0) {
GST_DEBUG ("Siren7_DecodeFrame returned %d", decode_ret); GST_ERROR_OBJECT (dec, "Siren7_DecodeFrame returned %d", decode_ret);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
} }
@ -321,9 +318,10 @@ gst_siren_dec_transform (GstBaseTransform *trans, GstBuffer *inbuf,
offset += 640; offset += 640;
} }
GST_DEBUG ("Finished decoding : %d", offset); GST_LOG_OBJECT (dec, "Finished decoding : %d", offset);
if (offset != GST_BUFFER_SIZE (outbuf)) { if (offset != GST_BUFFER_SIZE (outbuf)) {
GST_DEBUG ("didn't decode enough : offfset (%d) != BUFFER_SIZE (%d)", GST_ERROR_OBJECT (dec,
"didn't decode enough : offfset (%d) != BUFFER_SIZE (%d)",
offset, GST_BUFFER_SIZE (outbuf)); offset, GST_BUFFER_SIZE (outbuf));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -332,7 +330,6 @@ gst_siren_dec_transform (GstBaseTransform *trans, GstBuffer *inbuf,
} }
gboolean gboolean
gst_siren_dec_plugin_init (GstPlugin *plugin) gst_siren_dec_plugin_init (GstPlugin *plugin)
{ {