dtsdec: avoid crashing upon draining

... and clean up some variable init and debug statement.

diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c
index 474803f59275fbff48977b20dcc6d34c4bef0ba8..4a304f8e81b667198633261e633b174df8e5e27d 100644 (file)
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -492,11 +492,15 @@ gst_dtsdec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
   guint8 *data;
   gint size, chans;
   gint length = 0, flags, sample_rate, bit_rate, frame_length;
-  GstFlowReturn result = GST_FLOW_UNEXPECTED;
+  GstFlowReturn result = GST_FLOW_OK;
   GstBuffer *outbuf;
 
   dts = GST_DTSDEC (bdec);
 
+  /* no fancy draining */
+  if (G_UNLIKELY (!buffer))
+    return GST_FLOW_OK;
+
   /* parsed stuff already, so this should work out fine */
   data = GST_BUFFER_DATA (buffer);
   size = GST_BUFFER_SIZE (buffer);
@@ -597,7 +601,8 @@ gst_dtsdec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
 
   /* negotiate if required */
   if (need_renegotiation) {
-    GST_DEBUG ("dtsdec: sample_rate:%d stream_chans:0x%x using_chans:0x%x",
+    GST_DEBUG_OBJECT (dts,
+        "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))
       goto failed_negotiation;