From dfd00f0d0afe949410350d0a7e028929565f157e Mon Sep 17 00:00:00 2001 From: Gregor Wagner Date: Wed, 1 Jun 2016 13:47:02 +0200 Subject: [PATCH] Bug 1277212 - Fix MediaDataDecoderCallback::Error callbacks in GonkMediaDecoder. r=tzimmermann --- dom/media/platforms/gonk/GonkMediaDataDecoder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp b/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp index 70bfbf558b40..41775158856e 100644 --- a/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp +++ b/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp @@ -175,7 +175,7 @@ GonkDecoderManager::ProcessInput(bool aEndOfStream) } } else { GMDD_LOG("input processed: error#%d", rv); - mDecodeCallback->Error(); + mDecodeCallback->Error(MediaDataDecoderError::FATAL_ERROR); } } @@ -189,7 +189,7 @@ GonkDecoderManager::ProcessFlush() mWaitOutput.Clear(); if (mDecoder->flush() != OK) { GMDD_LOG("flush error"); - mDecodeCallback->Error(); + mDecodeCallback->Error(MediaDataDecoderError::FATAL_ERROR); } mIsFlushing = false; lock.NotifyAll(); @@ -225,7 +225,7 @@ GonkDecoderManager::ProcessToDo(bool aEndOfStream) mToDo.clear(); if (NumQueuedSamples() > 0 && ProcessQueuedSamples() < 0) { - mDecodeCallback->Error(); + mDecodeCallback->Error(MediaDataDecoderError::FATAL_ERROR); return; } @@ -252,7 +252,7 @@ GonkDecoderManager::ProcessToDo(bool aEndOfStream) } else if (rv == NS_ERROR_NOT_AVAILABLE) { break; } else { - mDecodeCallback->Error(); + mDecodeCallback->Error(MediaDataDecoderError::FATAL_ERROR); return; } } @@ -280,7 +280,7 @@ GonkDecoderManager::ResetEOS() mWaitOutput.Clear(); if (mDecoder->flush() != OK) { GMDD_LOG("flush error"); - mDecodeCallback->Error(); + mDecodeCallback->Error(MediaDataDecoderError::FATAL_ERROR); } }