| Index: content/renderer/media/media_stream_audio_sink_owner.cc
|
| diff --git a/content/renderer/media/media_stream_audio_sink_owner.cc b/content/renderer/media/media_stream_audio_sink_owner.cc
|
| index 664988d8213471e775cd09972afeba9aff8ff078..7f1734667ef465a73a78b6bca8b635d18f7550a1 100644
|
| --- a/content/renderer/media/media_stream_audio_sink_owner.cc
|
| +++ b/content/renderer/media/media_stream_audio_sink_owner.cc
|
| @@ -13,26 +13,17 @@ MediaStreamAudioSinkOwner::MediaStreamAudioSinkOwner(MediaStreamAudioSink* sink)
|
| : delegate_(sink) {
|
| }
|
|
|
| -int MediaStreamAudioSinkOwner::OnData(const int16* audio_data,
|
| - int sample_rate,
|
| - int number_of_channels,
|
| - int number_of_frames,
|
| - const std::vector<int>& channels,
|
| - int audio_delay_milliseconds,
|
| - int current_volume,
|
| - bool need_audio_processing,
|
| - bool key_pressed) {
|
| +void MediaStreamAudioSinkOwner::OnData(const int16* audio_data,
|
| + int sample_rate,
|
| + int number_of_channels,
|
| + int number_of_frames) {
|
| base::AutoLock lock(lock_);
|
| - // TODO(xians): Investigate on the possibility of not calling out with the
|
| - // lock.
|
| if (delegate_) {
|
| delegate_->OnData(audio_data,
|
| sample_rate,
|
| number_of_channels,
|
| number_of_frames);
|
| }
|
| -
|
| - return 0;
|
| }
|
|
|
| void MediaStreamAudioSinkOwner::OnSetFormat(
|
| @@ -61,10 +52,4 @@ bool MediaStreamAudioSinkOwner::IsEqual(
|
| return (other == delegate_);
|
| }
|
|
|
| -bool MediaStreamAudioSinkOwner::IsEqual(
|
| - const PeerConnectionAudioSink* other) const {
|
| - DCHECK(other);
|
| - return false;
|
| -}
|
| -
|
| } // namespace content
|
|
|