Index: media/base/android/media_codec_decoder.cc |
diff --git a/media/base/android/media_codec_decoder.cc b/media/base/android/media_codec_decoder.cc |
index 40a0495e5c8fc21ed487de71ff8d95a2f5bb1832..b47dfb20d3e9dd0126067669f7bba67f8765bf81 100644 |
--- a/media/base/android/media_codec_decoder.cc |
+++ b/media/base/android/media_codec_decoder.cc |
@@ -39,9 +39,11 @@ MediaCodecDecoder::MediaCodecDecoder( |
const base::Closure& stop_done_cb, |
const base::Closure& key_required_cb, |
const base::Closure& error_cb, |
- const char* decoder_thread_name) |
+ const char* decoder_thread_name, |
+ FrameStatistics* frame_statistics) |
: media_task_runner_(media_task_runner), |
decoder_thread_(decoder_thread_name), |
+ frame_statistics_(frame_statistics), |
xhwang
2015/09/30 21:02:57
nit: Make the initialization order consistent with
Tima Vaisburd
2015/10/01 20:05:15
Done.
|
needs_reconfigure_(false), |
drain_decoder_(false), |
always_reconfigure_for_tests_(false), |
@@ -507,7 +509,7 @@ void MediaCodecDecoder::DoEmergencyStop() { |
key_request_posted_ = false; |
} |
-void MediaCodecDecoder::CheckLastFrame(bool eos_encountered, |
+bool MediaCodecDecoder::CheckLastFrame(bool eos_encountered, |
bool has_delayed_tasks) { |
DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread()); |
@@ -519,6 +521,7 @@ void MediaCodecDecoder::CheckLastFrame(bool eos_encountered, |
weak_factory_.GetWeakPtr(), eos_encountered)); |
last_frame_posted_ = true; |
} |
+ return last_frame_posted_; |
} |
void MediaCodecDecoder::OnCodecError() { |