wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1056537 - Bustage fix: move DecodeToFirstVideoData back to MediaDecoderReader for now. r=UNDISCLOSED TREETOPS

Browse Source
This commit is contained in:
Matthew Gregan 2014-08-22 15:11:58 +12:00
parent 96e00df3cc
commit 210eeb19a7
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
content/media/MediaDecoderReader.cpp
View File

@ -105,6 +105,26 @@ nsresult MediaDecoderReader::ResetDecode()
return res;
}
VideoData* MediaDecoderReader::DecodeToFirstVideoData()
{
bool eof = false;
while (!eof && VideoQueue().GetSize() == 0) {
{
ReentrantMonitorAutoEnter decoderMon(mDecoder->GetReentrantMonitor());
if (mDecoder->IsShutdown()) {
return nullptr;
}
}
bool keyframeSkip = false;
eof = !DecodeVideoFrame(keyframeSkip, 0);
}
if (eof) {
VideoQueue().Finish();
}
VideoData* d = nullptr;
return (d = VideoQueue().PeekFront()) ? d : nullptr;
}
nsresult
MediaDecoderReader::GetBuffered(mozilla::dom::TimeRanges* aBuffered,
int64_t aStartTime)

3
content/media/MediaDecoderReader.h
View File

@ -163,6 +163,9 @@ public:
return mDecoder;
}
// TODO: DEPRECATED. This uses synchronous decoding.
VideoData* DecodeToFirstVideoData();
MediaInfo GetMediaInfo() { return mInfo; }
// Indicates if the media is seekable.

20
content/media/ogg/OggReader.cpp
View File

@ -1894,26 +1894,6 @@ VideoData* OggReader::FindStartTime(int64_t& aOutStartTime)
return videoData;
}
VideoData* OggReader::DecodeToFirstVideoData()
{
bool eof = false;
while (!eof && VideoQueue().GetSize() == 0) {
{
ReentrantMonitorAutoEnter decoderMon(mDecoder->GetReentrantMonitor());
if (mDecoder->IsShutdown()) {
return nullptr;
}
}
bool keyframeSkip = false;
eof = !DecodeVideoFrame(keyframeSkip, 0);
}
if (eof) {
VideoQueue().Finish();
}
VideoData* d = nullptr;
return (d = VideoQueue().PeekFront()) ? d : nullptr;
}
AudioData* OggReader::DecodeToFirstAudioData()
{
bool eof = false;

1
content/media/ogg/OggReader.h
View File

@ -90,7 +90,6 @@ private:
// frame, if we have video.
VideoData* FindStartTime(int64_t& aOutStartTime);
AudioData* DecodeToFirstAudioData();
VideoData* DecodeToFirstVideoData();
// This monitor should be taken when reading or writing to mIsChained.
ReentrantMonitor mMonitor;