Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/cast/audio_receiver/audio_receiver.h" | 5 #include "media/cast/audio_receiver/audio_receiver.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "media/cast/audio_receiver/audio_decoder.h" | 10 #include "media/cast/audio_receiver/audio_decoder.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 class LocalRtpAudioFeedback : public RtpPayloadFeedback { | 64 class LocalRtpAudioFeedback : public RtpPayloadFeedback { |
| 65 public: | 65 public: |
| 66 explicit LocalRtpAudioFeedback(AudioReceiver* audio_receiver) | 66 explicit LocalRtpAudioFeedback(AudioReceiver* audio_receiver) |
| 67 : audio_receiver_(audio_receiver) { | 67 : audio_receiver_(audio_receiver) { |
| 68 } | 68 } |
| 69 | 69 |
| 70 virtual void CastFeedback(const RtcpCastMessage& cast_message) OVERRIDE { | 70 virtual void CastFeedback(const RtcpCastMessage& cast_message) OVERRIDE { |
| 71 audio_receiver_->CastFeedback(cast_message); | 71 audio_receiver_->CastFeedback(cast_message); |
| 72 } | 72 } |
| 73 | 73 |
| 74 virtual void RequestKeyFrame() OVERRIDE { | 74 virtual void RequestKeyFrame() { |
|
hubbe
2013/09/26 23:03:20
I guess I don't understand OVERRIDE, why is it not
Alpha Left Google
2013/09/27 00:45:13
Because base class doesn't have this method any mo
hubbe
2013/09/27 19:22:53
Then delete it?
Or at least add a TODO
Alpha Left Google
2013/09/27 21:13:53
Already removed.
| |
| 75 DCHECK(false) << "Invalid callback"; | 75 DCHECK(false) << "Invalid callback"; |
| 76 } | 76 } |
| 77 | 77 |
| 78 private: | 78 private: |
| 79 AudioReceiver* audio_receiver_; | 79 AudioReceiver* audio_receiver_; |
| 80 }; | 80 }; |
| 81 | 81 |
| 82 class LocalRtpReceiverStatistics : public RtpReceiverStatistics { | 82 class LocalRtpReceiverStatistics : public RtpReceiverStatistics { |
| 83 public: | 83 public: |
| 84 explicit LocalRtpReceiverStatistics(RtpReceiver* rtp_receiver) | 84 explicit LocalRtpReceiverStatistics(RtpReceiver* rtp_receiver) |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 295 weak_factory_.GetWeakPtr()), time_to_send); | 295 weak_factory_.GetWeakPtr()), time_to_send); |
| 296 } | 296 } |
| 297 | 297 |
| 298 void AudioReceiver::SendNextRtcpReport() { | 298 void AudioReceiver::SendNextRtcpReport() { |
| 299 rtcp_->SendRtcpReport(incoming_ssrc_); | 299 rtcp_->SendRtcpReport(incoming_ssrc_); |
| 300 ScheduleNextRtcpReport(); | 300 ScheduleNextRtcpReport(); |
| 301 } | 301 } |
| 302 | 302 |
| 303 } // namespace cast | 303 } // namespace cast |
| 304 } // namespace media | 304 } // namespace media |
| OLD | NEW |