trunk/src/media/cast/audio_receiver/audio_decoder.cc - Issue 129113003: Revert 243647 "Cast:Adding cast_transport_config and cleaning up"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 129113003: Revert 243647 "Cast:Adding cast_transport_config and cleaning up" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 months 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

« no previous file with comments | « trunk/src/chrome/renderer/media/cast_session_delegate.cc ('k') | trunk/src/media/cast/audio_receiver/audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/media/cast/audio_receiver/audio_decoder.cc

===================================================================

--- trunk/src/media/cast/audio_receiver/audio_decoder.cc (revision 243647)

+++ trunk/src/media/cast/audio_receiver/audio_decoder.cc (working copy)

@@ -25,7 +25,7 @@

webrtc::CodecInst receive_codec;

switch (audio_config.codec) {

- case transport::kPcm16:

+ case 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 @@

receive_codec.channels = audio_config.channels;

receive_codec.rate = -1;

break;

- case transport::kOpus:

+ case 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 @@

receive_codec.channels = audio_config.channels;

receive_codec.rate = -1;

break;

- case transport::kExternalAudio:

+ case kExternalAudio:

NOTREACHED() << "Codec must be specified for audio decoder";

break;

}

@@ -109,7 +109,7 @@

size_t payload_size,

const RtpCastHeader& rtp_header) {

DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));

- DCHECK_LE(payload_size, kMaxIpPacketSize);

+ DCHECK_LE(payload_size, kIpPacketSize);

audio_decoder_->IncomingPacket(payload_data, static_cast<int32>(payload_size),

rtp_header.webrtc);

lock_.Acquire();