Re-enable AudioPlayTillCompletion test with logs

Added logs to try to debug on the bot.

TBR=qinmin@

BUG=518900

Review URL: https://codereview.chromium.org/1282713004

Cr-Commit-Position: refs/heads/master@{#342935}

5 files changed, 19 insertions, 9 deletions

diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
index 2f09e31..44ff029 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
@@ -355,6 +355,7 @@ class MediaCodecBridge {
     @CalledByNative
     private void release() {
         try {
+            Log.w(TAG, "calling MediaCodec.release()");
             mMediaCodec.release();
         } catch (IllegalStateException e) {
             // The MediaCodec is stuck in a wrong state, possibly due to losing
@@ -706,6 +707,7 @@ class MediaCodecBridge {
                 mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig,
                         AudioFormat.ENCODING_PCM_16BIT, minBufferSize, AudioTrack.MODE_STREAM);
                 if (mAudioTrack.getState() == AudioTrack.STATE_UNINITIALIZED) {
+                    Log.e(TAG, "Cannot create AudioTrack");
                     mAudioTrack = null;
                     return false;
                 }
diff --git a/media/base/android/media_codec_audio_decoder.cc b/media/base/android/media_codec_audio_decoder.cc
index c910ce6..373d062 100644
--- a/media/base/android/media_codec_audio_decoder.cc
+++ b/media/base/android/media_codec_audio_decoder.cc
@@ -128,13 +128,14 @@ MediaCodecDecoder::ConfigStatus MediaCodecAudioDecoder::ConfigureInternal() {
                configs_.audio_seek_preroll_ns,
                true,
                GetMediaCrypto().obj())) {
-    DVLOG(1) << class_name() << "::" << __FUNCTION__ << " failed";
+    DVLOG(0) << class_name() << "::" << __FUNCTION__
+             << " failed: cannot start audio codec";
 
     media_codec_bridge_.reset();
     return kConfigFailure;
   }
 
-  DVLOG(1) << class_name() << "::" << __FUNCTION__ << " succeeded";
+  DVLOG(0) << class_name() << "::" << __FUNCTION__ << " succeeded";
 
   SetVolumeInternal();
 
diff --git a/media/base/android/media_codec_decoder.cc b/media/base/android/media_codec_decoder.cc
index 67425c6..d311491 100644
--- a/media/base/android/media_codec_decoder.cc
+++ b/media/base/android/media_codec_decoder.cc
@@ -256,11 +256,13 @@ bool MediaCodecDecoder::Start(base::TimeDelta current_time) {
 
   // Start the decoder thread
   if (!decoder_thread_.Start()) {
-    DVLOG(1) << class_name() << "::" << __FUNCTION__
+    DVLOG(0) << class_name() << "::" << __FUNCTION__
              << ": cannot start decoder thread";
     return false;
   }
 
+  DVLOG(0) << class_name() << "::" << __FUNCTION__ << " decoder thread started";
+
   SetState(kRunning);
 
   decoder_thread_.task_runner()->PostTask(
@@ -326,7 +328,7 @@ void MediaCodecDecoder::RequestToStop() {
 void MediaCodecDecoder::OnLastFrameRendered(bool completed) {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
-  DVLOG(1) << class_name() << "::" << __FUNCTION__
+  DVLOG(0) << class_name() << "::" << __FUNCTION__
            << " completed:" << completed;
 
   decoder_thread_.Stop();  // synchronous
@@ -656,7 +658,7 @@ bool MediaCodecDecoder::DepleteOutputBufferQueue() {
   }
 
   if (status == MEDIA_CODEC_ERROR) {
-    DVLOG(1) << class_name() << "::" << __FUNCTION__
+    DVLOG(0) << class_name() << "::" << __FUNCTION__
              << " MediaCodec error, stopping frame processing";
     return false;
   }
diff --git a/media/base/android/media_codec_decoder_unittest.cc b/media/base/android/media_codec_decoder_unittest.cc
index e5eab4d..ceef6be 100644
--- a/media/base/android/media_codec_decoder_unittest.cc
+++ b/media/base/android/media_codec_decoder_unittest.cc
@@ -150,7 +150,7 @@ class MediaCodecDecoderTest : public testing::Test {
   void OnDataRequested();
   void OnStarvation() { is_starved_ = true; }
   void OnStopDone() { is_stopped_ = true; }
-  void OnError() {}
+  void OnError() { DVLOG(0) << "MediaCodecDecoderTest::" << __FUNCTION__; }
   void OnUpdateCurrentTime(base::TimeDelta now_playing,
                            base::TimeDelta last_buffered) {
     // Add the |last_buffered| value for PTS. For video it is the same as
@@ -460,9 +460,11 @@ TEST_F(MediaCodecDecoderTest, AudioStartWithoutConfigure) {
 }
 
 // http://crbug.com/518900
-TEST_F(MediaCodecDecoderTest, DISABLED_AudioPlayTillCompletion) {
+TEST_F(MediaCodecDecoderTest, AudioPlayTillCompletion) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
+  DVLOG(0) << "AudioPlayTillCompletion started";
+
   CreateAudioDecoder();
 
   base::TimeDelta duration = base::TimeDelta::FromMilliseconds(500);
@@ -493,6 +495,8 @@ TEST_F(MediaCodecDecoderTest, DISABLED_AudioPlayTillCompletion) {
   // Last buffered timestamp should be no less than PTS.
   EXPECT_EQ(22, pts_stat_.num_values());
   EXPECT_LE(data_factory_->last_pts(), pts_stat_.max());
+
+  DVLOG(0) << "AudioPlayTillCompletion stopping";
 }
 
 TEST_F(MediaCodecDecoderTest, VideoPlayTillCompletion) {
diff --git a/media/base/android/media_codec_video_decoder.cc b/media/base/android/media_codec_video_decoder.cc
index 2eccc40..20ce21d 100644
--- a/media/base/android/media_codec_video_decoder.cc
+++ b/media/base/android/media_codec_video_decoder.cc
@@ -148,11 +148,12 @@ MediaCodecDecoder::ConfigStatus MediaCodecVideoDecoder::ConfigureInternal() {
       GetMediaCrypto().obj()));
 
   if (!media_codec_bridge_) {
-    DVLOG(1) << class_name() << "::" << __FUNCTION__ << " failed";
+    DVLOG(0) << class_name() << "::" << __FUNCTION__
+             << " failed: cannot create video codec";
     return kConfigFailure;
   }
 
-  DVLOG(1) << class_name() << "::" << __FUNCTION__ << " succeeded";
+  DVLOG(0) << class_name() << "::" << __FUNCTION__ << " succeeded";
 
   media_task_runner_->PostTask(FROM_HERE, codec_created_cb_);