Fix an issue that a browser seek is requested after decoder draining is interrupted.

media/base/android/media_decoder_job.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 100 matching lines @@
 }
 
 bool MediaDecoderJob::Decode(
     base::TimeTicks start_time_ticks,
     base::TimeDelta start_presentation_timestamp,
     const DecoderCallback& callback) {
   DCHECK(decode_cb_.is_null());
   DCHECK(data_received_cb_.is_null());
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   if (!media_codec_bridge_ || need_to_reconfig_decoder_job_) {
+    if (drain_decoder_)
+      OnDecoderDrained();
     need_to_reconfig_decoder_job_ = !CreateMediaCodecBridge();
-    if (drain_decoder_) {
-      // Decoder has been recreated, stop draining.
-      drain_decoder_ = false;
-      input_eos_encountered_ = false;
-      output_eos_encountered_ = false;
-      access_unit_index_[current_demuxer_data_index_]++;
-    }
     skip_eos_enqueue_ = true;
     if (need_to_reconfig_decoder_job_)
       return false;
   }
 
   decode_cb_ = callback;
 
   if (!HasData()) {
     RequestData(base::Bind(&MediaDecoderJob::DecodeCurrentAccessUnit,
                            base::Unretained(this),
@@ skipping 525 matching lines @@
 
 void MediaDecoderJob::ReleaseMediaCodecBridge() {
   if (!media_codec_bridge_)
     return;
 
   media_codec_bridge_.reset();
   input_buf_index_ = -1;
 }
 
 }  // namespace media