[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1759-g9d14acb

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  9d14acb46f2b59b9dbdb96932e52e848b8500202 (commit)
      from  7f69fae422c4cb3406bc81e877fe173120d5620b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=9d14acb46f2b59b9dbdb96932e52e848b8500202


commit 9d14acb46f2b59b9dbdb96932e52e848b8500202
Author: Sandro Santilli <address@hidden>
Date:   Thu Aug 22 10:31:42 2013 +0200

    Drop unused probing code from GST MediaParser
    
    This completes what 8e986fb9 started (that commit set probe size
    to zero, effectively disabling it but without dropping the code).
    
    As a side effect, it fixes a warning reporting that the dropped
    code was indeed not running.
    
    Obsoletes patch #8165

diff --git a/libmedia/gst/MediaParserGst.cpp b/libmedia/gst/MediaParserGst.cpp
index 71f98c9..7da2e2f 100644
--- a/libmedia/gst/MediaParserGst.cpp
+++ b/libmedia/gst/MediaParserGst.cpp
@@ -30,8 +30,6 @@
 #include <fstream>
 
 #define PUSHBUF_SIZE 1024
-//#define MIN_PROBE_SIZE (PUSHBUF_SIZE * 3)
-#define MIN_PROBE_SIZE 0
 
 // #define GNASH_DEBUG_DATAFLOW
 
@@ -72,24 +70,6 @@ MediaParserGst::MediaParserGst(std::auto_ptr<IOChannel> 
stream)
         throw GnashException(_("MediaParserGst could not change element 
state"));
     }
     
-    SimpleTimer timer;
-
-    size_t counter = 0;
-    while (!probingConditionsMet(timer) && !_stream->eof() && !_stream->bad()) 
{
-
-        if (!pushGstBuffer()) {
-            ++counter;
-        }
-    }
-
-    log_debug(_("Needed %d dead iterations to detect audio type."), counter);
-    
-#if 0
-    if (! (_videoInfo.get() || _audioInfo.get()) ) {
-        throw MediaException(_("MediaParserGst failed to detect any stream 
types."));    
-    }
-#endif
-    
     if (!gst_element_set_state (_bin, GST_STATE_PLAYING) == 
GST_STATE_CHANGE_SUCCESS) {
         throw MediaException(_("MediaParserGst could not change element 
state"));
     }
@@ -254,17 +234,6 @@ bool MediaParserGst::foundAllStreams()
     return _demux_probe_ended || (_videoInfo.get() && _audioInfo.get());
 }
 
-/// The idea here is that probingConditionsMet will return false, unless:
-/// a) all data types in the stream were found. 
-/// b) The timer (currently for 1 second) has expired, if and only if we
-///    succeeded in pushing MIN_PROBE_SIZE bytes into the bin. This should
-///    protect low-bandwidth cases from stopping the probe early.
-
-bool MediaParserGst::probingConditionsMet(const SimpleTimer& timer)
-{
-    return foundAllStreams() || (timer.expired() && getBytesLoaded() >= 
MIN_PROBE_SIZE);
-}
-
 static void
 print_caps(GstCaps* caps)
 {
diff --git a/libmedia/gst/MediaParserGst.h b/libmedia/gst/MediaParserGst.h
index 601835c..5970d0e 100644
--- a/libmedia/gst/MediaParserGst.h
+++ b/libmedia/gst/MediaParserGst.h
@@ -130,8 +130,6 @@ public:
 private:
     bool foundAllStreams();
 
-    bool probingConditionsMet(const SimpleTimer& timer);    
-    
     void link_to_fakesink(GstPad* pad);
 
     static void cb_typefound (GstElement *typefind, guint probability,

-----------------------------------------------------------------------

Summary of changes:
 libmedia/gst/MediaParserGst.cpp |   31 -------------------------------
 libmedia/gst/MediaParserGst.h   |    2 --
 2 files changed, 0 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
Gnash