ext/musepack/gstmusepackdec.cpp: Fetch error return values. Fixes #161624.

Original commit message from CVS:
* ext/musepack/gstmusepackdec.cpp:
Fetch error return values. Fixes #161624.
* gst/apetag/apedemux.c: (gst_ape_demux_stream_data):
Really EOS.

diff --git a/ChangeLog b/ChangeLog
index 9c954bd7f5a53b4479bc7ec4807840962cf81b41..5561fbcc89da557d7ed15823b0bc250cd93b9b70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * ext/musepack/gstmusepackdec.cpp:
+         Fetch error return values. Fixes #161624.
+       * gst/apetag/apedemux.c: (gst_ape_demux_stream_data):
+         Really EOS.
+
 2004-12-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * gst/avi/gstavidemux.c: (gst_avi_demux_stream_index):

diff --git a/ext/musepack/gstmusepackdec.c b/ext/musepack/gstmusepackdec.c
index a86828c2b97f760fb6da180bf3b44b168d551f5e..7917a346df618b4d1142ab969747b8774458248e 100644 (file)
--- a/ext/musepack/gstmusepackdec.c
+++ b/ext/musepack/gstmusepackdec.c
@@ -416,6 +416,7 @@ gst_musepackdec_loop (GstElement * element)
   GstMusepackDec *musepackdec = GST_MUSEPACK_DEC (element);
   GstBuffer *out;
   GstFormat fmt;
+  gint ret;
 
   if (!musepackdec->dec) {
     if (!gst_musepack_stream_init (musepackdec))
@@ -444,9 +445,8 @@ gst_musepackdec_loop (GstElement * element)
   }
 
   out = gst_buffer_new_and_alloc (MPC_decoder::DecodeBufferLength * 4);
-  GST_BUFFER_SIZE (out) =
-      musepackdec->dec->Decode ((MPC_SAMPLE_FORMAT *) GST_BUFFER_DATA (out));
-  if (GST_BUFFER_SIZE (out) == 0) {
+  ret = musepackdec->dec->Decode ((MPC_SAMPLE_FORMAT *) GST_BUFFER_DATA (out));
+  if (ret <= 0) {
     if (musepackdec->reader->eos == true) {
       gst_element_set_eos (element);
       gst_pad_push (musepackdec->srcpad,
@@ -455,6 +455,7 @@ gst_musepackdec_loop (GstElement * element)
     gst_buffer_unref (out);
     return;
   }
+  GST_BUFFER_SIZE (out) = ret;
   /* note that the size is still in samples */
   fmt = GST_FORMAT_TIME;
   gst_pad_query (musepackdec->srcpad,

diff --git a/ext/musepack/gstmusepackdec.cpp b/ext/musepack/gstmusepackdec.cpp
index a86828c2b97f760fb6da180bf3b44b168d551f5e..7917a346df618b4d1142ab969747b8774458248e 100644 (file)
--- a/ext/musepack/gstmusepackdec.cpp
+++ b/ext/musepack/gstmusepackdec.cpp
@@ -416,6 +416,7 @@ gst_musepackdec_loop (GstElement * element)
   GstMusepackDec *musepackdec = GST_MUSEPACK_DEC (element);
   GstBuffer *out;
   GstFormat fmt;
+  gint ret;
 
   if (!musepackdec->dec) {
     if (!gst_musepack_stream_init (musepackdec))
@@ -444,9 +445,8 @@ gst_musepackdec_loop (GstElement * element)
   }
 
   out = gst_buffer_new_and_alloc (MPC_decoder::DecodeBufferLength * 4);
-  GST_BUFFER_SIZE (out) =
-      musepackdec->dec->Decode ((MPC_SAMPLE_FORMAT *) GST_BUFFER_DATA (out));
-  if (GST_BUFFER_SIZE (out) == 0) {
+  ret = musepackdec->dec->Decode ((MPC_SAMPLE_FORMAT *) GST_BUFFER_DATA (out));
+  if (ret <= 0) {
     if (musepackdec->reader->eos == true) {
       gst_element_set_eos (element);
       gst_pad_push (musepackdec->srcpad,
@@ -455,6 +455,7 @@ gst_musepackdec_loop (GstElement * element)
     gst_buffer_unref (out);
     return;
   }
+  GST_BUFFER_SIZE (out) = ret;
   /* note that the size is still in samples */
   fmt = GST_FORMAT_TIME;
   gst_pad_query (musepackdec->srcpad,

diff --git a/gst/apetag/apedemux.c b/gst/apetag/apedemux.c
index 0c2322616ebeb6492a8d450fc55e97c88bcea4fc..8830cae3d1c860ed0768c94c1ed800fcde86edc9 100644 (file)
--- a/gst/apetag/apedemux.c
+++ b/gst/apetag/apedemux.c
@@ -721,12 +721,17 @@ gst_ape_demux_stream_data (GstApeDemux * ape)
         new = gst_event_new_discontinuous (GST_EVENT_DISCONT_NEW_MEDIA (event),
             GST_FORMAT_BYTES, new_off, GST_FORMAT_UNDEFINED);
         gst_event_unref (event);
+        event = new;
         data = GST_DATA (new);
         break;
       }
       default:
         break;
     }
+
+    gst_pad_event_default (ape->sinkpad, event);
+
+    return;
   } else {
     GstBuffer *buf = GST_BUFFER (data), *kid;
     gint64 pos, len;