summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRocky Bernstein <rockyb@users.sourceforge.net>2002-12-15 04:58:07 +0000
committerRocky Bernstein <rockyb@users.sourceforge.net>2002-12-15 04:58:07 +0000
commit9bb55911fd29144cbc33822209df217b9d9ddb51 (patch)
treeaa277cbd45ad80b93d84d6f2ddac68385ae527ed
parent027fdef11578125ccf14c40f113e9c8c520d8952 (diff)
downloadxine-lib-9bb55911fd29144cbc33822209df217b9d9ddb51.tar.gz
xine-lib-9bb55911fd29144cbc33822209df217b9d9ddb51.tar.bz2
Disable demux_mpeg_block_estimate_rate. This should be used only if
the mux rate is found faulty since 1. It has problems of its own. 2. It does more I/O and work than just using the mux rate 3. The protocol way should be given the first chance. CVS patchset: 3535 CVS date: 2002/12/15 04:58:07
-rw-r--r--src/demuxers/demux_mpeg_block.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 8a08524d8..c94957c21 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_block.c,v 1.148 2002/12/15 01:05:36 rockyb Exp $
+ * $Id: demux_mpeg_block.c,v 1.149 2002/12/15 04:58:07 rockyb Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -646,6 +646,9 @@ static int demux_mpeg_block_send_chunk (demux_plugin_t *this_gen) {
in bytes and in time.
On failure return 0.
+
+ This might be used after deciding that mux_rate in a stream is faulty.
+
*/
/* How many *sucessful* PTS samples do we take? */
@@ -855,8 +858,13 @@ static void demux_mpeg_block_send_headers (demux_plugin_t *this_gen) {
xine_demux_control_start(this->stream);
- if (!this->rate)
+ if (!this->rate) {
+#ifdef ESITMATE_RATE_FIXED
this->rate = demux_mpeg_block_estimate_rate (this);
+#else
+ this->rate = 0;
+#endif
+ }
if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {