media: Delete renderer/demuxer splicing code.

media/renderers/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
 //    Where the object is created.
 // 2. Media thread (provided via constructor)
@@ skipping 29 matching lines @@
 namespace base {
 class SingleThreadTaskRunner;
 class TickClock;
 }
 
 namespace media {
 
 class AudioBufferConverter;
 class AudioBus;
 class AudioClock;
-class AudioSplicer;
 class DecryptingDemuxerStream;
 
 class MEDIA_EXPORT AudioRendererImpl
     : public AudioRenderer,
       public TimeSource,
       public base::PowerObserver,
       NON_EXPORTED_BASE(public AudioRendererSink::RenderCallback) {
  public:
   // |task_runner| is the thread on which AudioRendererImpl will execute.
   //
@@ skipping 58 matching lines @@
     kFlushed,
     kPlaying
   };
 
   // Callback from the audio decoder delivering decoded audio samples.
   void DecodedAudioReady(AudioBufferStream::Status status,
                          const scoped_refptr<AudioBuffer>& buffer);
 
   // Handles buffers that come out of |splicer_|.
   // Returns true if more buffers are needed.
-  bool HandleSplicerBuffer_Locked(const scoped_refptr<AudioBuffer>& buffer);
+  bool HandleDecodedBuffer_Locked(const scoped_refptr<AudioBuffer>& buffer);
 
   // Helper functions for DecodeStatus values passed to
   // DecodedAudioReady().
   void HandleAbortedReadOrDecodeError(PipelineStatus status);
 
   void StartRendering_Locked();
   void StopRendering_Locked();
 
   // AudioRendererSink::RenderCallback implementation.
   //
@@ skipping 54 matching lines @@
   void OnNewSpliceBuffer(base::TimeDelta);
 
   // Called by the AudioBufferStream when a config change occurs.
   void OnConfigChange();
 
   // Updates |buffering_state_| and fires |buffering_state_cb_|.
   void SetBufferingState_Locked(BufferingState buffering_state);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  std::unique_ptr<AudioSplicer> splicer_;
   std::unique_ptr<AudioBufferConverter> buffer_converter_;
 
   // Whether or not we expect to handle config changes.
   bool expecting_config_changes_;
 
   // The sink (destination) for rendered audio. |sink_| must only be accessed
   // on |task_runner_|. |sink_| must never be called under |lock_| or else we
   // may deadlock between |task_runner_| and the audio callback thread.
   scoped_refptr<media::AudioRendererSink> sink_;
 
   std::unique_ptr<AudioBufferStream> audio_buffer_stream_;
 
   scoped_refptr<MediaLog> media_log_;
 
   // Cached copy of hardware params from |sink_|.
   AudioParameters audio_parameters_;
 
   RendererClient* client_;
 
   // Callback provided during Initialize().
   PipelineStatusCB init_cb_;
 
   // Callback provided to Flush().
   base::Closure flush_cb_;
 
   // Overridable tick clock for testing.
   std::unique_ptr<base::TickClock> tick_clock_;
 
   // Memory usage of |algorithm_| recorded during the last
-  // HandleSplicerBuffer_Locked() call.
+  // HandleDecodedBuffer_Locked() call.
   int64_t last_audio_memory_usage_;
 
   // Sample rate of the last decoded audio buffer. Allows for detection of
   // sample rate changes due to implicit AAC configuration change.
   int last_decoded_sample_rate_;
 
   // After Initialize() has completed, all variables below must be accessed
   // under |lock_|. ------------------------------------------------------------
   base::Lock lock_;
 
@@ skipping 49 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<AudioRendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_AUDIO_RENDERER_IMPL_H_