Bug 1283394. Part 2 - remove some null-checks. r=kaku
MozReview-Commit-ID: D8DkptoCNgK
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -293,19 +293,19 @@ NextFrameSeekTask::OnAudioDecoded(MediaD
{
AssertOwnerThread();
MOZ_ASSERT(aAudioSample);
// The MDSM::mDecodedAudioEndTime will be updated once the whole SeekTask is
// resolved.
SAMPLE_LOG("OnAudioDecoded [%lld,%lld] disc=%d",
- (aAudioSample ? aAudioSample->mTime : -1),
- (aAudioSample ? aAudioSample->GetEndTime() : -1),
- (aAudioSample ? aAudioSample->mDiscontinuity : 0));
+ aAudioSample->mTime,
+ aAudioSample->GetEndTime(),
+ aAudioSample->mDiscontinuity);
if (!Exists()) {
// We've received a sample from a previous decode. Discard it.
return;
}
// We accept any audio data here.
mSeekedAudioData = aAudioSample;
@@ -336,19 +336,19 @@ NextFrameSeekTask::OnVideoDecoded(MediaD
{
AssertOwnerThread();
MOZ_ASSERT(aVideoSample);
// The MDSM::mDecodedVideoEndTime will be updated once the whole SeekTask is
// resolved.
SAMPLE_LOG("OnVideoDecoded [%lld,%lld] disc=%d",
- (aVideoSample ? aVideoSample->mTime : -1),
- (aVideoSample ? aVideoSample->GetEndTime() : -1),
- (aVideoSample ? aVideoSample->mDiscontinuity : 0));
+ aVideoSample->mTime,
+ aVideoSample->GetEndTime(),
+ aVideoSample->mDiscontinuity);
if (!Exists()) {
// We've received a sample from a previous decode. Discard it.
return;
}
if (aVideoSample->mTime > mCurrentTimeBeforeSeek) {
mSeekedVideoData = aVideoSample;