Collapse AudioRendererMixer and OnMoreDataResampler into AudioTransform.

remoting/codec/audio_encoder_opus.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 "remoting/codec/audio_encoder_opus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "media/base/audio_bus.h"
@@ skipping 106 matching lines @@
                    << sampling_rate_ << " samples per second.";
       return false;
     }
 
     InitEncoder();
   }
 
   return encoder_ != NULL;
 }
 
-void AudioEncoderOpus::FetchBytesToResample(media::AudioBus* audio_bus) {
+void AudioEncoderOpus::FetchBytesToResample(int resampler_frame_delay,
+                                            media::AudioBus* audio_bus) {
   DCHECK(resampling_data_);
   int samples_left = (resampling_data_size_ - resampling_data_pos_) /
       kBytesPerSample / channels_;
   DCHECK_LE(audio_bus->frames(), samples_left);
   audio_bus->FromInterleaved(
       resampling_data_ + resampling_data_pos_,
       audio_bus->frames(), kBytesPerSample);
   resampling_data_pos_ += audio_bus->frames() * kBytesPerSample * channels_;
   DCHECK_LE(resampling_data_pos_, static_cast<int>(resampling_data_size_));
 }
@@ skipping 93 matching lines @@
   }
 
   // Return NULL if there's nothing in the packet.
   if (encoded_packet->data_size() == 0)
     return scoped_ptr<AudioPacket>();
 
   return encoded_packet.Pass();
 }
 
 }  // namespace remoting