media: Delete renderer/demuxer splicing code.

media/renderers/audio_renderer_impl_unittest.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/renderers/audio_renderer_impl.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/format_macros.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/base/audio_buffer_converter.h"
-#include "media/base/audio_splicer.h"
 #include "media/base/fake_audio_renderer_sink.h"
 #include "media/base/gmock_callback_support.h"
 #include "media/base/media_util.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::base::TimeDelta;
 using ::testing::_;
 using ::testing::Return;
@@ skipping 333 matching lines @@
 
   void force_config_change() {
     renderer_->OnConfigChange();
   }
 
   InputFrames converter_input_frames_left() const {
     return InputFrames(
         renderer_->buffer_converter_->input_frames_left_for_testing());
   }
 
-  bool splicer_has_next_buffer() const {
-    return renderer_->splicer_->HasNextBuffer();
-  }
-
   base::TimeDelta CurrentMediaTime() {
     return renderer_->CurrentMediaTime();
   }
 
   bool ended() const { return ended_; }
 
   // Fixture members.
   AudioParameters hardware_params_;
   base::MessageLoop message_loop_;
   std::unique_ptr<AudioRendererImpl> renderer_;
@@ skipping 279 matching lines @@
 }
 
 TEST_F(AudioRendererImplTest, InitializeThenDestroy) {
   InitializeAndDestroy();
 }
 
 TEST_F(AudioRendererImplTest, InitializeThenDestroyDuringDecoderInit) {
   InitializeAndDestroyDuringDecoderInit();
 }
 
+//
+// TODO- CONFIG change no longer drains converter. Anything to test here?
+//
 TEST_F(AudioRendererImplTest, ConfigChangeDrainsConverter) {
   Initialize();
   Preroll();
   StartTicking();
 
   // Drain internal buffer, we should have a pending read.
   EXPECT_TRUE(ConsumeBufferedData(frames_buffered()));
   WaitForPendingRead();
 
   // Deliver a little bit of data.  Use an odd data size to ensure there is data
   // left in the AudioBufferConverter.  Ensure no buffers are in the splicer.
   SatisfyPendingRead(InputFrames(2053));
-  EXPECT_FALSE(splicer_has_next_buffer());
+  // EXPECT_FALSE(splicer_has_next_buffer());
   EXPECT_GT(converter_input_frames_left().value, 0);
 
   // Force a config change and then ensure all buffered data has been put into
   // the splicer.
   force_config_change();
-  EXPECT_TRUE(splicer_has_next_buffer());
+  // EXPECT_TRUE(splicer_has_next_buffer());
   EXPECT_EQ(0, converter_input_frames_left().value);
 }
 
 TEST_F(AudioRendererImplTest, CurrentMediaTimeBehavior) {
   Initialize();
   Preroll();
   StartTicking();
 
   AudioTimestampHelper timestamp_helper(kOutputSamplesPerSecond);
   timestamp_helper.SetBaseTimestamp(base::TimeDelta());
@@ skipping 315 matching lines @@
   // Advance far enough that we shouldn't be clamped to current time (tested
   // already above).
   tick_clock_->Advance(kOneSecond);
   EXPECT_EQ(
       current_time + timestamp_helper.GetFrameDuration(frames_to_consume.value),
       CurrentMediaWallClockTime(&is_time_moving));
   EXPECT_TRUE(is_time_moving);
 }
 
 }  // namespace media