Skip to content

Commit

Permalink
Bug 1289976. Part 2 - Remove the IsShutdown() check from MediaDecoder…
Browse files Browse the repository at this point in the history
…::DumpDebugInfo() which happens before Shutdown(). r=kaku

MozReview-Commit-ID: HU3ybjFZMsE

--HG--
extra : rebase_source : 15d9adb47be449fdaca6a37587e70ff4f1d013bf
  • Loading branch information
jwwang committed Jul 27, 2016
1 parent 0a748cd commit 61a6cb7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions dom/media/MediaDecoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1942,17 +1942,18 @@ MediaDecoder::NextFrameBufferedStatus()
void
MediaDecoder::DumpDebugInfo()
{
MOZ_ASSERT(!IsShutdown());
DUMP_LOG("metadata: channels=%u rate=%u hasAudio=%d hasVideo=%d, "
"state: mPlayState=%s mIsDormant=%d, IsShutdown()=%d",
"state: mPlayState=%s mIsDormant=%d",
mInfo ? mInfo->mAudio.mChannels : 0, mInfo ? mInfo->mAudio.mRate : 0,
mInfo ? mInfo->HasAudio() : 0, mInfo ? mInfo->HasVideo() : 0,
PlayStateStr(), mIsDormant, IsShutdown());
PlayStateStr(), mIsDormant);

nsString str;
GetMozDebugReaderData(str);
DUMP_LOG("reader data:\n%s", NS_ConvertUTF16toUTF8(str).get());

if (!IsShutdown() && GetStateMachine()) {
if (GetStateMachine()) {
GetStateMachine()->DumpDebugInfo();
}
}
Expand Down

0 comments on commit 61a6cb7

Please sign in to comment.