Fix the flushing process of DecryptingAudioDecoder.

media/filters/decrypting_audio_decoder.cc

 // Copyright (c) 2012 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/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 279 matching lines @@
 
     state_ = kWaitingForKey;
     return;
   }
 
   if (status == Decryptor::kNeedMoreData) {
     DVLOG(2) << "DeliverFrame() - kNeedMoreData";
     if (scoped_pending_buffer_to_decode->end_of_stream()) {
       state_ = kDecodeFinished;
       output_cb_.Run(AudioBuffer::CreateEOSBuffer());
-      base::ResetAndReturn(&decode_cb_).Run(kOk);
-      return;
+    } else {
+      state_ = kIdle;
     }
-
-    state_ = kIdle;
     base::ResetAndReturn(&decode_cb_).Run(kOk);
     return;
   }
 
   DCHECK_EQ(status, Decryptor::kSuccess);
   DCHECK(!frames.empty());
   ProcessDecodedFrames(frames);
 
+  if (scoped_pending_buffer_to_decode->end_of_stream()) {
+    // Set |pending_buffer_to_decode_| back as we need to keep flushing the
+    // decryptor until kNeedMoreData is returned.
+    pending_buffer_to_decode_ = scoped_pending_buffer_to_decode;
+    DecodePendingBuffer();
+    return;
+  }
+
   state_ = kIdle;
   base::ResetAndReturn(&decode_cb_).Run(kOk);
 }
 
 void DecryptingAudioDecoder::OnKeyAdded() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (state_ == kPendingDecode) {
     key_added_while_decode_pending_ = true;
     return;
@@ skipping 32 matching lines @@
     }
 
     frame->set_timestamp(current_time);
     timestamp_helper_->AddFrames(frame->frame_count());
 
     output_cb_.Run(frame);
   }
 }
 
 }  // namespace media