Enable seek in fullscreen mode for MSE impl on android

Enable seek in fullscreen mode for MSE impl on android

Since the actual MediaCodec instances live in browser process, we need to inform the chunk demuxer when a seek happens.
To avoid race conditions, all the operations related to seek needs to be performed on the browser thread, instead of MediaDecoderJobs' own threads. Here is the work flow of the fullscreen seek event:
1. User hit the seek bar.
2. MediaSourcePlayer waits for all the decoder tasks to finish on the browser thread.
3. MediaSourcePlayer sends MediaSeekRequest to render process.
4. Render process gets the MediaSeekRequest, sends back the ack, and ask chunk demuxer to do a seek
5. MediaSourcePlayer gets the MediaSeekRequestAck, and starts sending IPC for getting more data

For embedded video case, the workflow is:
1. user hit the seek bar
2. WebMediaPlayerAndroid sends a SeekTo message to MediaSourcePlayer.
3. MediaSourcePlayer waits for all the decoder tasks to finish, and then follows step 3-5 as shown in the fullscreen case.

This change also allows toggling from embedded mode to fullscreen mode. When that happens, we first wait for the current decoding tasks to finish. Then perform a seek and reestablish the surface.


BUG=233420
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202098

[qinmin, 2013-05-20 23:24:40]

PTAL

[acolwell GONE FROM CHROMIUM, 2013-05-21 17:49:42]

Looks good. Just a few questions.

https://codereview.chromium.org/15499006/diff/2001/content/common/media/media...
File content/common/media/media_player_messages.h (right):

https://codereview.chromium.org/15499006/diff/2001/content/common/media/media...
content/common/media/media_player_messages.h:131: #if defined(OS_ANDROID)
nit: Is this #if still needed?

https://codereview.chromium.org/15499006/diff/2001/content/common/media/media...
content/common/media/media_player_messages.h:184: #if defined(OS_ANDROID)
nit: ditto

https://codereview.chromium.org/15499006/diff/2001/media/base/android/media_s...
File media/base/android/media_source_player.cc (right):

https://codereview.chromium.org/15499006/diff/2001/media/base/android/media_s...
media/base/android/media_source_player.cc:402: if (active_decoding_tasks_)
nit add '> 0' just to be safe or a DCHECK_GE(active_decoding_tasks_, 0)?

https://codereview.chromium.org/15499006/diff/2001/webkit/media/android/webme...
File webkit/media/android/webmediaplayer_android.cc (right):

https://codereview.chromium.org/15499006/diff/2001/webkit/media/android/webme...
webkit/media/android/webmediaplayer_android.cc:163:
media_source_delegate_->Seek(seek_time);
If this is left in for GOOGLE_TV would this cause a double call on the
media_source_delegate? Can't we just remove this outright?

https://codereview.chromium.org/15499006/diff/2001/webkit/media/android/webme...
File webkit/media/android/webmediaplayer_android.h (left):

https://codereview.chromium.org/15499006/diff/2001/webkit/media/android/webme...
webkit/media/android/webmediaplayer_android.h:150: virtual void
OnMediaMetadataChanged(base::TimeDelta duration, int width,
Why is this being removed?

[qinmin, 2013-05-21 23:04:56]

https://chromiumcodereview.appspot.com/15499006/diff/2001/content/common/medi...
File content/common/media/media_player_messages.h (right):

https://chromiumcodereview.appspot.com/15499006/diff/2001/content/common/medi...
content/common/media/media_player_messages.h:131: #if defined(OS_ANDROID)
Synced to the TOT, and this should be gone.

On 2013/05/21 17:49:42, acolwell wrote:
> nit: Is this #if still needed?

https://chromiumcodereview.appspot.com/15499006/diff/2001/content/common/medi...
content/common/media/media_player_messages.h:184: #if defined(OS_ANDROID)
On 2013/05/21 17:49:42, acolwell wrote:
> nit: ditto

Done.

https://chromiumcodereview.appspot.com/15499006/diff/2001/media/base/android/...
File media/base/android/media_source_player.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/2001/media/base/android/...
media/base/android/media_source_player.cc:402: if (active_decoding_tasks_)
On 2013/05/21 17:49:42, acolwell wrote:
> nit add '> 0' just to be safe or a DCHECK_GE(active_decoding_tasks_, 0)?

Done.

https://chromiumcodereview.appspot.com/15499006/diff/2001/webkit/media/androi...
File webkit/media/android/webmediaplayer_android.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/2001/webkit/media/androi...
webkit/media/android/webmediaplayer_android.cc:163:
media_source_delegate_->Seek(seek_time);
GTV is not using media_source_player, so seek() will not be called twice as they
won't hit the OnMediaSeekRequest() method I added here. 
added a TODO here to sync up with the GTV team

On 2013/05/21 17:49:42, acolwell wrote:
> If this is left in for GOOGLE_TV would this cause a double call on the
> media_source_delegate? Can't we just remove this outright?

https://chromiumcodereview.appspot.com/15499006/diff/2001/webkit/media/androi...
File webkit/media/android/webmediaplayer_android.h (left):

https://chromiumcodereview.appspot.com/15499006/diff/2001/webkit/media/androi...
webkit/media/android/webmediaplayer_android.h:150: virtual void
OnMediaMetadataChanged(base::TimeDelta duration, int width,
Removed all the virutal keyword. This class is no longer being inheited, so
virtual doesn't fit here.

On 2013/05/21 17:49:42, acolwell wrote:
> Why is this being removed?

[ycheo (away), 2013-05-22 06:17:00]

Hi Min,

I have a question, before starting the review.
When user do seeking in the fullscreen mode, should we send the 'seeking' event
to JS side that JS player can feed the elementary stream from the seek point?

Thanks,
Yuncheol

[ycheo (away), 2013-05-22 06:59:13]

https://codereview.chromium.org/15499006/diff/7001/media/base/android/media_s...
File media/base/android/media_source_player.cc (right):

https://codereview.chromium.org/15499006/diff/7001/media/base/android/media_s...
media/base/android/media_source_player.cc:285: if (!active_decoding_tasks_)
This SeekTo() can be called from ContentVideoView::SeekTo() which is Java
thread.
So do we need a lock for the data members used in this method?

[qinmin, 2013-05-22 07:12:54]

I am not sure which solution is better. Hooking up something inside JS sounds
ok, but that is also a hack, similar to this approach.  And we want to avoid the
possibility that a JS call can trigger some other events, like page layout and
deleting the video element. This may cause the current video view to get
deleted.
Personally I prefer not to touch the JS part. For <video>, we use the same
approach as the one we used here.  But we can check back later and see which
solution is actually better. I will file a bug to keep track of this. 

On 2013/05/22 06:17:00, Yuncheol Heo wrote:
> Hi Min,
> 
> I have a question, before starting the review.
> When user do seeking in the fullscreen mode, should we send the 'seeking'
event
> to JS side that JS player can feed the elementary stream from the seek point?
> 
> Thanks,
> Yuncheol

[qinmin, 2013-05-22 07:20:37]

https://codereview.chromium.org/15499006/diff/7001/media/base/android/media_s...
File media/base/android/media_source_player.cc (right):

https://codereview.chromium.org/15499006/diff/7001/media/base/android/media_s...
media/base/android/media_source_player.cc:285: if (!active_decoding_tasks_)
SeekTo() is always called on the browser thread since the java view lives on it.
So there is no race condition here.
If you take a look at the MediaPlayerBridge, only the listener callbacks will be
on different threads. In that case, we always post the tasks onto the browser
thread.  Similarly for MediaSourcePlayer, all the calls should be on the browser
thread (excluding decoder jobs which has its own thread).

On 2013/05/22 06:59:13, Yuncheol Heo wrote:
> This SeekTo() can be called from ContentVideoView::SeekTo() which is Java
> thread.
> So do we need a lock for the data members used in this method?

[ycheo (away), 2013-05-22 11:45:11]

lgtm

[qinmin, 2013-05-23 17:45:16]

ping. Aaron, would you please take a look again?

made some changes to MediaSourcePlayer, so now toggling from embedded mode to
fullscreen mode should not crash any more (basically conduct another seek when
switching surfaces)

[Yaron, 2013-05-23 18:14:26]

content/browser/android lgtm

[acolwell GONE FROM CHROMIUM, 2013-05-23 18:21:30]

Looks good. Just one comment about fixing another seeking related issued.

https://chromiumcodereview.appspot.com/15499006/diff/7001/webkit/media/androi...
File webkit/media/android/webmediaplayer_android.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/7001/webkit/media/androi...
webkit/media/android/webmediaplayer_android.cc:161: #if defined(GOOGLE_TV)
At a minimum, this code MUST arrange for chunk_demuxer_->CancelPendingSeek() and
chunk_demuxer_->StartWaitingForSeek() inside this call stack like
WebMediaPlayerImpl does. If you don't it can cause playback to deadlock when
there isn't enough data to complete a seek. The call to chunk_demuxer_->Seek()
can be deferred to a later point in time though.

[qinmin, 2013-05-23 20:07:21]

https://chromiumcodereview.appspot.com/15499006/diff/7001/webkit/media/androi...
File webkit/media/android/webmediaplayer_android.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/7001/webkit/media/androi...
webkit/media/android/webmediaplayer_android.cc:161: #if defined(GOOGLE_TV)
Done. MediaSourceDelegate::Seek() already packs in
chunk_demuxer->StartWaitingForSeek(). Added a call to cancelPendingSeek(). 

On 2013/05/23 18:21:30, acolwell wrote:
> At a minimum, this code MUST arrange for chunk_demuxer_->CancelPendingSeek()
and
> chunk_demuxer_->StartWaitingForSeek() inside this call stack like
> WebMediaPlayerImpl does. If you don't it can cause playback to deadlock when
> there isn't enough data to complete a seek. The call to chunk_demuxer_->Seek()
> can be deferred to a later point in time though.

[acolwell GONE FROM CHROMIUM, 2013-05-23 20:58:27]

lgtm. I believe there are still more issues with seeking, but I'm fine with
these changes as is. I'll dig through the seeking code more once this lands and
propose followup CLs.

https://chromiumcodereview.appspot.com/15499006/diff/24001/media/base/android...
File media/base/android/media_source_player.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/24001/media/base/android...
media/base/android/media_source_player.cc:243: pending_event_ &=
~SURFACE_CHANGE_EVENT_PENDING;
nit: DCHECK_EQ(pending_event_ & SEEK_EVENT_PENDING, 0)?

https://chromiumcodereview.appspot.com/15499006/diff/24001/webkit/media/andro...
File webkit/media/android/webmediaplayer_android.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/24001/webkit/media/andro...
webkit/media/android/webmediaplayer_android.cc:514:
media_source_delegate_->CancelPendingSeek();
It's not clear to me why this is needed. It seems like it should be !seeking_
above since in the single seek case I'm pretty sure seeking_ is always true
here.

[qinmin, 2013-05-23 22:03:36]

https://chromiumcodereview.appspot.com/15499006/diff/24001/media/base/android...
File media/base/android/media_source_player.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/24001/media/base/android...
media/base/android/media_source_player.cc:243: pending_event_ &=
~SURFACE_CHANGE_EVENT_PENDING;
We cannot guarantee the bit is cleared at this time. Here is what can happen:
Browser send the SeekRequest msg to renderer.
Renderer sends back the SeekRequestAck, and sends an IPC to gpu thread to pass
the surface to the player. 
The gpu thead might get the IPC first, and post a task onto the browser thread
to call this function. In that case, the SEEK_EVENT_PENDING flag is still not
cleared yet.

Changed the description though. change "performed" to "requested"

On 2013/05/23 20:58:27, acolwell wrote:
> nit: DCHECK_EQ(pending_event_ & SEEK_EVENT_PENDING, 0)?

https://chromiumcodereview.appspot.com/15499006/diff/24001/webkit/media/andro...
File webkit/media/android/webmediaplayer_android.cc (right):

https://chromiumcodereview.appspot.com/15499006/diff/24001/webkit/media/andro...
webkit/media/android/webmediaplayer_android.cc:514:
media_source_delegate_->CancelPendingSeek();
changed the if statement to (!seeking_). If the seek is requested in fullscreen
mode, seeking_ will be false here.

On 2013/05/23 20:58:27, acolwell wrote:
> It's not clear to me why this is needed. It seems like it should be !seeking_
> above since in the single seek case I'm pretty sure seeking_ is always true
> here.

[commit-bot: I haz the power, 2013-05-24 04:23:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/15499006/30001

[commit-bot: I haz the power, 2013-05-24 09:30:26]

Failed to apply patch for media/base/android/media_source_player.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file media/base/android/media_source_player.cc
  Hunk #2 FAILED at 208.
  Hunk #3 succeeded at 216 (offset -1 lines).
  Hunk #4 succeeded at 234 with fuzz 2 (offset 1 line).
  Hunk #5 succeeded at 263 (offset 1 line).
  Hunk #6 succeeded at 270 (offset 1 line).
  Hunk #7 succeeded at 288 (offset 1 line).
  Hunk #8 succeeded at 301 (offset 1 line).
  Hunk #9 succeeded at 330 (offset 1 line).
  Hunk #10 succeeded at 361 (offset 1 line).
  Hunk #11 succeeded at 462 (offset 1 line).
  Hunk #12 succeeded at 482 (offset 1 line).
  Hunk #13 succeeded at 501 (offset 1 line).
  1 out of 13 hunks FAILED -- saving rejects to file
media/base/android/media_source_player.cc.rej

Patch:       media/base/android/media_source_player.cc
Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc
b/media/base/android/media_source_player.cc
index
b29d182d84938638a33561467efe1f6dae3f4c9a..57d99378180226c2657b07481d824fb33100b254
100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -192,7 +192,8 @@ MediaSourcePlayer::MediaSourcePlayer(
     int player_id,
     MediaPlayerManager* manager)
     : MediaPlayerAndroid(player_id, manager),
-      pending_play_(false),
+      pending_event_(NO_EVENT_PENDING),
+      active_decoding_tasks_(0),
       width_(0),
       height_(0),
       audio_codec_(kUnknownAudioCodec),
@@ -207,8 +208,8 @@ MediaSourcePlayer::MediaSourcePlayer(
       video_access_unit_index_(0),
       waiting_for_audio_data_(false),
       waiting_for_video_data_(false),
+      use_empty_surface_(true),
       weak_this_(this) {
-  OnMediaMetadataChanged(duration_, width_, height_, false);
 }
 
 MediaSourcePlayer::~MediaSourcePlayer() {
@@ -216,8 +217,15 @@ MediaSourcePlayer::~MediaSourcePlayer() {
 }
 
 void MediaSourcePlayer::SetVideoSurface(jobject surface) {
-  video_decoder_job_.reset();
-  if (!surface) {
+  use_empty_surface_ =  surface ? false : true;
+
+  // If we haven't processed a surface change event, do so now.
+  if (active_decoding_tasks_ > 0) {
+    pending_event_ |= SURFACE_CHANGE_EVENT_PENDING;
+    // Request a seek so that the next decoder will decode an I-frame first.
+    // Or otherwise, MediaCodec might crash. See b/8950387.
+    pending_event_ |= SEEK_EVENT_PENDING;
+    ProcessPendingEvents();
     return;
   }
 
@@ -225,16 +233,27 @@ void MediaSourcePlayer::SetVideoSurface(jobject surface) {
       base::MessageLoopProxy::current(), video_codec_,
       gfx::Size(width_, height_), surface));
 
-  if (pending_play_)
-    StartInternal();
-
   // Inform the fullscreen view the player is ready.
   // TODO(qinmin): refactor MediaPlayerBridge so that we have a better way
   // to inform ContentVideoView.
   OnMediaMetadataChanged(duration_, width_, height_, true);
+
+  if (pending_event_ & SURFACE_CHANGE_EVENT_PENDING) {
+    // We should already requested a seek in this case.
+    pending_event_ &= ~SURFACE_CHANGE_EVENT_PENDING;
+  } else {
+    // Perform a seek so the new decoder can get the I-frame first.
+    pending_event_ |= SEEK_EVENT_PENDING;
+    ProcessPendingEvents();
+    return;
+  }
+
+  if (playing_)
+    StartInternal();
 }
 
 void MediaSourcePlayer::Start() {
+  playing_ = true;
   if (HasAudio() && !audio_decoder_job_) {
     audio_decoder_job_.reset(new AudioDecoderJob(
         base::MessageLoopProxy::current(), audio_codec_, sampling_rate_,
@@ -243,7 +262,6 @@ void MediaSourcePlayer::Start() {
 
   if (HasVideo() && !video_decoder_job_) {
     // StartInternal() will be delayed until SetVideoSurface() gets called.
-    pending_play_ = true;
     return;
   }
 
@@ -251,13 +269,12 @@ void MediaSourcePlayer::Start() {
 }
 
 void MediaSourcePlayer::Pause() {
-  pending_play_ = false;
   playing_ = false;
   start_wallclock_time_ = base::Time();
 }
 
 bool MediaSourcePlayer::IsPlaying() {
-  return pending_play_ || playing_;
+  return playing_;
 }
 
 int MediaSourcePlayer::GetVideoWidth() {
@@ -270,17 +287,8 @@ int MediaSourcePlayer::GetVideoHeight() {
 
 void MediaSourcePlayer::SeekTo(base::TimeDelta timestamp) {
   last_presentation_timestamp_ = timestamp;
-  start_wallclock_time_ = base::Time();
-  last_seek_time_ = base::Time::Now();
-  if (audio_decoder_job_)
-    audio_decoder_job_->Flush();
-  if (video_decoder_job_)
-    video_decoder_job_->Flush();
-  received_audio_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
-  received_video_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
-  audio_access_unit_index_ = 0;
-  video_access_unit_index_ = 0;
-  OnSeekComplete();
+  pending_event_ |= SEEK_EVENT_PENDING;
+  ProcessPendingEvents();
 }
 
 base::TimeDelta MediaSourcePlayer::GetCurrentTime() {
@@ -292,8 +300,12 @@ base::TimeDelta MediaSourcePlayer::GetDuration() {
 }
 
 void MediaSourcePlayer::Release() {
+  ClearDecodingData();
   audio_decoder_job_.reset();
   video_decoder_job_.reset();
+  active_decoding_tasks_ = 0;
+  playing_ = false;
+  pending_event_ = NO_EVENT_PENDING;
   ReleaseMediaResourcesFromManager();
 }
 
@@ -317,9 +329,9 @@ bool MediaSourcePlayer::IsPlayerReady() {
 }
 
 void MediaSourcePlayer::StartInternal() {
-  if (playing_)
+  // Do nothing if the decoders are already running.
+  if (active_decoding_tasks_ > 0 || pending_event_ != NO_EVENT_PENDING)
     return;
-  playing_ = true;
 
   if (HasAudio()) {
     audio_finished_ = false;
@@ -348,41 +360,77 @@ void MediaSourcePlayer::DemuxerReady(
 
 void MediaSourcePlayer::ReadFromDemuxerAck(
     const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
+  if (params.type == DemuxerStream::AUDIO)
+    waiting_for_audio_data_ = false;
+  else
+    waiting_for_video_data_ = false;
+
+  // If there is a pending seek request, ignore the data from the chunk
demuxer.
+  // The data will be requested later when OnSeekRequestAck() is called.
+  if (pending_event_ & SEEK_EVENT_PENDING)
+    return;
+
   if (params.type == DemuxerStream::AUDIO) {
     DCHECK_EQ(0u, audio_access_unit_index_);
     received_audio_ = params;
-    waiting_for_audio_data_ = false;
-    DecodeMoreAudio();
+    if (!pending_event_)
+      DecodeMoreAudio();
   } else {
     DCHECK_EQ(0u, video_access_unit_index_);
     received_video_ = params;
-    waiting_for_video_data_ = false;
-    DecodeMoreVideo();
+    if (!pending_event_)
+      DecodeMoreVideo();
   }
 }
 
+void MediaSourcePlayer::OnSeekRequestAck() {
+  pending_event_ &= ~SEEK_EVENT_PENDING;
+  OnSeekComplete();
+  if (playing_)
+    StartInternal();
+}
+
 void MediaSourcePlayer::UpdateTimestamps(
-    const base::Time& kickoff_time,
     const base::TimeDelta& presentation_timestamp,
     const base::Time& wallclock_time) {
-  // If the job was posted after last seek, update the presentation time.
-  // Otherwise, ignore it.
-  if (kickoff_time > last_seek_time_) {
-    last_presentation_timestamp_ = presentation_timestamp;
-    OnTimeUpdated();
-    if (start_wallclock_time_.is_null() && playing_) {
-      start_wallclock_time_ = wallclock_time;
-      start_presentation_timestamp_ = last_presentation_timestamp_;
-    }
+  last_presentation_timestamp_ = presentation_timestamp;
+  OnTimeUpdated();
+  if (start_wallclock_time_.is_null() && playing_) {
+    start_wallclock_time_ = wallclock_time;
+    start_presentation_timestamp_ = last_presentation_timestamp_;
+  }
+}
+
+void MediaSourcePlayer::ProcessPendingEvents() {
+  // Wait for all the decoding jobs to finish before sending a seek request.
+  if (active_decoding_tasks_ > 0)
+    return;
+
+  DCHECK(pending_event_ != NO_EVENT_PENDING);
+  if (use_empty_surface_ && (pending_event_ & SURFACE_CHANGE_EVENT_PENDING)) {
+    video_decoder_job_.reset();
+    pending_event_ &= ~SURFACE_CHANGE_EVENT_PENDING;
   }
+
+  ClearDecodingData();
+  manager()->OnMediaSeekRequest(player_id(),
+                                last_presentation_timestamp_,
+                                pending_event_ & SURFACE_CHANGE_EVENT_PENDING);
 }
 
 void MediaSourcePlayer::MediaDecoderCallback(
-    bool is_audio, const base::Time& kickoff_time,
-    const base::TimeDelta& presentation_timestamp,
+    bool is_audio, const base::TimeDelta& presentation_timestamp,
     const base::Time& wallclock_time, bool end_of_stream) {
+  if (active_decoding_tasks_ > 0)
+    active_decoding_tasks_--;
+
+  if (pending_event_ != NO_EVENT_PENDING) {
+    ProcessPendingEvents();
+    return;
+  }
+
   if (is_audio || !HasAudio())
-    UpdateTimestamps(kickoff_time, presentation_timestamp, wallclock_time);
+    UpdateTimestamps(presentation_timestamp, wallclock_time);
 
   if (end_of_stream) {
     PlaybackCompleted(is_audio);
@@ -413,8 +461,9 @@ void MediaSourcePlayer::DecodeMoreAudio() {
       received_audio_.access_units[audio_access_unit_index_],
       start_wallclock_time_, start_presentation_timestamp_,
       base::Bind(&MediaSourcePlayer::MediaDecoderCallback,
-                 weak_this_.GetWeakPtr(), true, base::Time::Now()));
-  ++audio_access_unit_index_;
+                 weak_this_.GetWeakPtr(), true));
+  active_decoding_tasks_++;
+  audio_access_unit_index_++;
 }
 
 void MediaSourcePlayer::DecodeMoreVideo() {
@@ -432,8 +481,9 @@ void MediaSourcePlayer::DecodeMoreVideo() {
       received_video_.access_units[video_access_unit_index_],
       start_wallclock_time_, start_presentation_timestamp_,
       base::Bind(&MediaSourcePlayer::MediaDecoderCallback,
-                 weak_this_.GetWeakPtr(), false, base::Time::Now()));
-  ++video_access_unit_index_;
+                 weak_this_.GetWeakPtr(), false));
+  active_decoding_tasks_++;
+  video_access_unit_index_++;
 }
 
 
@@ -450,6 +500,18 @@ void MediaSourcePlayer::PlaybackCompleted(bool is_audio) {
   }
 }
 
+void MediaSourcePlayer::ClearDecodingData() {
+  if (audio_decoder_job_)
+    audio_decoder_job_->Flush();
+  if (video_decode…
(message too large)

[commit-bot: I haz the power, 2013-05-24 13:24:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/15499006/46001

[commit-bot: I haz the power, 2013-05-24 16:08:43]

Change committed as 202098