corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out 4fd2bf2ec8db (bug 939662) for Windows build bustage

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda
2013-11-18 21:34:48 -08:00
parent f6cfa11d44
commit cf567e22c2
12 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/media/MediaDecoderStateMachine.cpp
View File

@@ -1605,7 +1605,7 @@ void MediaDecoderStateMachine::NotifyDataArrived(const char* aBuffer,
// faster than played, mEndTime won't reflect the end of playable data
// since we haven't played the frame at the end of buffered data. So update
// mEndTime here as new data is downloaded to prevent such a lag.
dom::TimeRanges buffered;
TimeRanges buffered;
if (mDecoder->IsInfinite() &&
NS_SUCCEEDED(mDecoder->GetBuffered(&buffered)))
{
@@ -1851,7 +1851,7 @@ int64_t MediaDecoderStateMachine::GetUndecodedData() const
AssertCurrentThreadInMonitor();
NS_ASSERTION(mState > DECODER_STATE_DECODING_METADATA,
"Must have loaded metadata for GetBuffered() to work");
dom::TimeRanges buffered;
TimeRanges buffered;
nsresult res = mDecoder->GetBuffered(&buffered);
NS_ENSURE_SUCCESS(res, 0);
@@ -2713,7 +2713,7 @@ void MediaDecoderStateMachine::StartBuffering()
stats.mDownloadRate/1024, stats.mDownloadRateReliable ? "" : " (unreliable)"));
}
nsresult MediaDecoderStateMachine::GetBuffered(dom::TimeRanges* aBuffered) {
nsresult MediaDecoderStateMachine::GetBuffered(TimeRanges* aBuffered) {
MediaResource* resource = mDecoder->GetResource();
NS_ENSURE_TRUE(resource, NS_ERROR_FAILURE);
resource->Pin();