Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 21:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 975928 - Use our estimate for MP3 duration rather than GStreamer's for buffered range end when fully buffered in MP3/GStreamer. r=alessandro.d

Browse Source
This commit is contained in:
Chris Pearce 2014-02-26 13:36:54 +13:00
parent 5ae8369536
commit 31baca752d
2 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
content/media/gstreamer/GStreamerReader.cpp
View File

@ -789,7 +789,11 @@ nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered,
/* fast path for local or completely cached files */
gint64 duration = 0;
duration = QueryDuration();
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
duration = mDecoder->GetMediaDuration();
}
double end = (double) duration / GST_MSECOND;
LOG(PR_LOG_DEBUG, "complete range [0, %f] for [0, %li]",
end, resource->GetLength());
@ -890,38 +894,6 @@ void GStreamerReader::ReadAndPushData(guint aLength)
MOZ_ASSERT(offset1 + bytesRead == offset2);
}
int64_t GStreamerReader::QueryDuration()
{
gint64 duration = 0;
GstFormat format = GST_FORMAT_TIME;
#if GST_VERSION_MAJOR >= 1
if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
format, &duration)) {
#else
if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
&format, &duration)) {
#endif
if (format == GST_FORMAT_TIME) {
LOG(PR_LOG_DEBUG, "pipeline duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (duration));
duration = GST_TIME_AS_USECONDS (duration);
}
}
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
int64_t media_duration = mDecoder->GetMediaDuration();
if (media_duration != -1 && media_duration > duration) {
// We decoded more than the reported duration (which could be estimated)
LOG(PR_LOG_DEBUG, "decoded duration > estimated duration");
duration = media_duration;
}
}
return duration;
}
void GStreamerReader::NeedDataCb(GstAppSrc* aSrc,
guint aLength,
gpointer aUserData)

1
content/media/gstreamer/GStreamerReader.h
View File

@ -71,7 +71,6 @@ public:
private:
void ReadAndPushData(guint aLength);
int64_t QueryDuration();
nsRefPtr<layers::PlanarYCbCrImage> GetImageFromBuffer(GstBuffer* aBuffer);
void CopyIntoImageBuffer(GstBuffer *aBuffer, GstBuffer** aOutBuffer, nsRefPtr<layers::PlanarYCbCrImage> &image);
GstCaps* BuildAudioSinkCaps();