Revert fix for regression in #347408 after release.

Original commit message from CVS:
* libs/gst/base/gstbasesrc.c: (gst_base_src_update_length):
* tests/check/elements/filesrc.c: (GST_START_TEST):
Revert fix for regression in #347408 after release.

diff --git a/ChangeLog b/ChangeLog
index 1780749ecd13ce7cbc02a5a533256bbecfc39b1a..9196634e704a20b3ac570f3fb9b90bb41f5c9f4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-14  Wim Taymans  <wim@fluendo.com>
+
+       * libs/gst/base/gstbasesrc.c: (gst_base_src_update_length):
+       * tests/check/elements/filesrc.c: (GST_START_TEST):
+       Revert fix for regression in #347408 after release.
+
 2006-07-14  Tim-Philipp Müller  <tim at centricular dot net>
 
        Patch by: Antoine Tremblay <hexa00 at gmail com>

diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 725e89291f9baf17e5216e76e3b6bbd09c303239..3c961beb5ca59cd559ea17ae5c1f2e94cfeecdb5 100644 (file)
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -1238,10 +1238,6 @@ gst_base_src_update_length (GstBaseSrc * src, guint64 offset, guint * length)
         *length = maxsize - offset;
     }
   }
-  /* FIXME, remove this check after release. Some elements pull 0 bytes
-   * and expect an UNEXPECTED return value (id3demux) */
-  if (*length == 0)
-    goto unexpected_length;
 
   /* keep track of current position. segment is in bytes, we checked 
    * that above. */

diff --git a/tests/check/elements/filesrc.c b/tests/check/elements/filesrc.c
index 2ec7b5d15f7a03aa44f7ab0e846070877f6f79d2..bb4a3fd32bc91b8201ee844b4d55fc9fa604687a 100644 (file)
--- a/tests/check/elements/filesrc.c
+++ b/tests/check/elements/filesrc.c
@@ -186,14 +186,12 @@ GST_START_TEST (test_pull)
   fail_unless (GST_BUFFER_SIZE (buffer1) == 10);
   gst_buffer_unref (buffer1);
 
-#if 0                           /* enable after 0 bytes pulls are fixed */
   /* read 0 bytes at end-1 should return 0 bytes */
   ret = gst_pad_get_range (pad, stop - 1, 0, &buffer1);
   fail_unless (ret == GST_FLOW_OK);
   fail_unless (buffer1 != NULL);
   fail_unless (GST_BUFFER_SIZE (buffer1) == 0);
   gst_buffer_unref (buffer1);
-#endif
 
   /* read 10 bytes at end-1 should return 1 byte */
   ret = gst_pad_get_range (pad, stop - 1, 10, &buffer1);