Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Unified Diff: media/cast/audio_receiver/audio_decoder.cc

Issue 109413004: Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating chrome/renderer Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/audio_receiver/audio_decoder.cc
diff --git a/media/cast/audio_receiver/audio_decoder.cc b/media/cast/audio_receiver/audio_decoder.cc
index a761a5a84deb275048f014e3fd735b13a33b5ffd..682b05b5f02b452e39bcc41a300d34c18485132a 100644
--- a/media/cast/audio_receiver/audio_decoder.cc
+++ b/media/cast/audio_receiver/audio_decoder.cc
@@ -25,7 +25,7 @@ AudioDecoder::AudioDecoder(scoped_refptr<CastEnvironment> cast_environment,
webrtc::CodecInst receive_codec;
switch (audio_config.codec) {
- case kPcm16:
+ case transport::kPcm16:
receive_codec.pltype = audio_config.rtp_payload_type;
strncpy(receive_codec.plname, "L16", 4);
receive_codec.plfreq = audio_config.frequency;
@@ -33,7 +33,7 @@ AudioDecoder::AudioDecoder(scoped_refptr<CastEnvironment> cast_environment,
receive_codec.channels = audio_config.channels;
receive_codec.rate = -1;
break;
- case kOpus:
+ case transport::kOpus:
receive_codec.pltype = audio_config.rtp_payload_type;
strncpy(receive_codec.plname, "opus", 5);
receive_codec.plfreq = audio_config.frequency;
@@ -41,7 +41,7 @@ AudioDecoder::AudioDecoder(scoped_refptr<CastEnvironment> cast_environment,
receive_codec.channels = audio_config.channels;
receive_codec.rate = -1;
break;
- case kExternalAudio:
+ case transport::kExternalAudio:
NOTREACHED() << "Codec must be specified for audio decoder";
break;
}
@@ -109,7 +109,7 @@ void AudioDecoder::IncomingParsedRtpPacket(const uint8* payload_data,
size_t payload_size,
const RtpCastHeader& rtp_header) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
- DCHECK_LE(payload_size, kIpPacketSize);
+ DCHECK_LE(payload_size, kMaxIpPacketSize);
audio_decoder_->IncomingPacket(payload_data, static_cast<int32>(payload_size),
rtp_header.webrtc);
lock_.Acquire();

Powered by Google App Engine
This is Rietveld 408576698