Consolidate and improve audio decoding test for all decoders.

media/filters/opus_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/opus_audio_decoder.h"
 
 #include <cmath>
 
 #include "base/single_thread_task_runner.h"
 #include "base/sys_byteorder.h"
@@ skipping 272 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!opus_decoder_)
     return;
 
   opus_multistream_decoder_ctl(opus_decoder_, OPUS_RESET_STATE);
   ResetTimestampState();
   CloseDecoder();
 }
 
 OpusAudioDecoder::~OpusAudioDecoder() {}

[wolenetz, 2014/06/16 23:36:08]

Enforce that ::Stop() is called before this if Initialize() is pending or has
successfully completed. See
https://code.google.com/p/chromium/codesearch#chromium/src/media/base/audio_d...
and DCHECKs in
https://code.google.com/p/chromium/codesearch#chromium/src/media/filters/ffmp...

This is orthogonal enough to be in a different CL if you like.

[DaleCurtis, 2014/06/19 01:05:52]

Added DCHECK() as best-effort since decoder doesn't keep state.

 
 void OpusAudioDecoder::DecodeBuffer(
     const scoped_refptr<DecoderBuffer>& input,
     const DecodeCB& decode_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!decode_cb.is_null());
 
-  DCHECK(input.get());
+  if (!input) {
+    decode_cb.Run(kAborted, NULL);
+    return;
+  }
 
   // Libopus does not buffer output. Decoding is complete when an end of stream
   // input buffer is received.
   if (input->end_of_stream()) {
     decode_cb.Run(kOk, AudioBuffer::CreateEOSBuffer());
     return;
   }
 
   // Make sure we are notified if http://crbug.com/49709 returns.  Issue also
   // occurs with some damaged files.
@@ skipping 164 matching lines @@
     output_buffer->get()->TrimEnd(trim_frames);
 
   // Handles discards and timestamping.  Discard the buffer if more data needed.
   if (!discard_helper_->ProcessBuffers(input, *output_buffer))
     *output_buffer = NULL;
 
   return true;
 }
 
 }  // namespace media