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

b=1023697 use MediaStream to convert ticks to time in MediaDecoderStateMachine r=roc

Browse Source
This commit is contained in:
Karl Tomlinson
2014-06-12 16:44:56 +12:00
parent e6031ab8ab
commit 61ecc111e3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
content/media/MediaDecoderStateMachine.cpp
View File

@@ -426,7 +426,8 @@ void MediaDecoderStateMachine::SendStreamData()
} }
minLastAudioPacketTime = std::min(minLastAudioPacketTime, stream->mLastAudioPacketTime); minLastAudioPacketTime = std::min(minLastAudioPacketTime, stream->mLastAudioPacketTime);
endPosition = std::max(endPosition, endPosition = std::max(endPosition,
TicksToTimeRoundDown(mInfo.mAudio.mRate, stream->mAudioFramesWritten)); mediaStream->TicksToTimeRoundDown(mInfo.mAudio.mRate,
stream->mAudioFramesWritten));
} }
if (mInfo.HasVideo()) { if (mInfo.HasVideo()) {
@@ -469,7 +470,7 @@ void MediaDecoderStateMachine::SendStreamData()
stream->mHaveSentFinishVideo = true; stream->mHaveSentFinishVideo = true;
} }
endPosition = std::max(endPosition, endPosition = std::max(endPosition,
TicksToTimeRoundDown(RATE_VIDEO, stream->mNextVideoTime - stream->mInitialTime)); mediaStream->TicksToTimeRoundDown(RATE_VIDEO, stream->mNextVideoTime - stream->mInitialTime));
} }
if (!stream->mHaveSentFinish) { if (!stream->mHaveSentFinish) {