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

Unified Diff: chrome/renderer/media/cast_rtp_stream.cc

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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 | « chrome/renderer/media/cast_ipc_dispatcher.cc ('k') | chrome/renderer/media/cast_session_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/media/cast_rtp_stream.cc
diff --git a/chrome/renderer/media/cast_rtp_stream.cc b/chrome/renderer/media/cast_rtp_stream.cc
index ff1fd9e67e798fd8aadbfe53825c47d131f5a86b..fa140767f958efded28b32cb7d6a0c782bb7e611 100644
--- a/chrome/renderer/media/cast_rtp_stream.cc
+++ b/chrome/renderer/media/cast_rtp_stream.cc
@@ -24,7 +24,7 @@
#include "media/cast/cast_config.h"
#include "media/cast/cast_defines.h"
#include "media/cast/cast_sender.h"
-#include "media/cast/transport/cast_transport_config.h"
+#include "media/cast/net/cast_transport_config.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
#include "ui/gfx/geometry/size.h"
@@ -168,7 +168,7 @@ bool ToAudioSenderConfig(const CastRtpParams& params,
return false;
config->bitrate = params.payload.max_bitrate * kBitrateMultiplier;
if (params.payload.codec_name == kCodecNameOpus)
- config->codec = media::cast::transport::CODEC_AUDIO_OPUS;
+ config->codec = media::cast::CODEC_AUDIO_OPUS;
else
return false;
config->aes_key = params.payload.aes_key;
@@ -201,10 +201,10 @@ bool ToVideoSenderConfig(const CastRtpParams& params,
config->start_bitrate = config->min_bitrate;
if (params.payload.codec_name == kCodecNameVp8) {
config->use_external_encoder = IsHardwareVP8EncodingSupported();
- config->codec = media::cast::transport::CODEC_VIDEO_VP8;
+ config->codec = media::cast::CODEC_VIDEO_VP8;
} else if (params.payload.codec_name == kCodecNameH264) {
config->use_external_encoder = IsHardwareH264EncodingSupported();
- config->codec = media::cast::transport::CODEC_VIDEO_H264;
+ config->codec = media::cast::CODEC_VIDEO_H264;
} else {
return false;
}
« no previous file with comments | « chrome/renderer/media/cast_ipc_dispatcher.cc ('k') | chrome/renderer/media/cast_session_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698