Add status parameter to DemuxerStream::ReadCB

media/filters/audio_renderer_impl.h

 // 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.
 
 // Audio rendering unit utilizing an AudioRendererSink to output data.
 //
 // This class lives inside three threads during it's lifetime, namely:
 // 1. Render thread.
 //    This object is created on the render thread.
 // 2. Pipeline thread
@@ skipping 55 matching lines @@
 
  protected:
   virtual ~AudioRendererImpl();
 
  private:
   friend class AudioRendererImplTest;
   FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, EndOfStream);
   FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, Underflow_EndOfStream);
 
   // Callback from the audio decoder delivering decoded audio samples.
-  void DecodedAudioReady(scoped_refptr<Buffer> buffer);
+  void DecodedAudioReady(AudioDecoder::Status status,
+                         const scoped_refptr<Buffer>& buffer);
+
+  // Helper functions for AudioDecoder::Status values passed to
+  // DecodedAudioReady().
+  void HandleDecodeError();
+  void HandleAbortedRead();

[Ami GONE FROM CHROMIUM, 2012/07/12 17:10:26]

swap order of these two to match enum

[acolwell GONE FROM CHROMIUM, 2012/07/12 21:59:58]

Done.

 
   // Fills the given buffer with audio data by delegating to its |algorithm_|.
   // FillBuffer() also takes care of updating the clock. Returns the number of
   // frames copied into |dest|, which may be less than or equal to
   // |requested_frames|.
   //
   // If this method returns fewer frames than |requested_frames|, it could
   // be a sign that the pipeline is stalled or unable to stream the data fast
   // enough.  In such scenarios, the callee should zero out unused portions
   // of their buffer to playback silence.
@@ skipping 123 matching lines @@
   bool underflow_disabled_;
 
   AudioDecoder::ReadCB read_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_