summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authortrav90 <travawine@protonmail.ch>2016-03-19 18:24:17 -0500
committertrav90 <travawine@protonmail.ch>2016-03-19 18:24:17 -0500
commit11689f975bc939d39b78ebdaf3e85175bde21207 (patch)
tree01acfd73d00405dfa254b2ec3109f5431aa40e04 /content
parent12ebacc4da705471c6d5b7a3c7f8e95dd885bfe5 (diff)
downloadpalemoon-gre-11689f975bc939d39b78ebdaf3e85175bde21207.tar.gz
Disable pull mode over http in the ogg demuxer.
Diffstat (limited to 'content')
-rw-r--r--content/media/gstreamer/GStreamerReader.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp
index 2a9ea13b3..f44b0b898 100644
--- a/content/media/gstreamer/GStreamerReader.cpp
+++ b/content/media/gstreamer/GStreamerReader.cpp
@@ -37,9 +37,16 @@ IsYV12Format(const VideoData::YCbCrBuffer::Plane& aYPlane,
const VideoData::YCbCrBuffer::Plane& aCbPlane,
const VideoData::YCbCrBuffer::Plane& aCrPlane);
+#if DEBUG
static const unsigned int MAX_CHANNELS = 4;
-// Let the demuxer work in pull mode for short files
-static const int SHORT_FILE_SIZE = 1024 * 1024;
+#endif
+// Let the demuxer work in pull mode for short files. This used to be a micro
+// optimization to have more accurate durations for ogg files in mochitests.
+// Since we aren't using gstreamer to demux ogg, and having demuxers
+// work in pull mode over http makes them slower (since they really assume
+// near-zero latency in pull mode) set the constant to 0 for now, which
+// effectively disables it.
+static const int SHORT_FILE_SIZE = 0;
// The default resource->Read() size when working in push mode
static const int DEFAULT_SOURCE_READ_SIZE = 50 * 1024;