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

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

Issue 126843003: Revert of Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | « no previous file | chrome/renderer/media/cast_session_delegate.cc » ('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 66ac92a6d58c787a534c6ce4815f6af9c38261bf..3f5f8d344e21f84b5a6c659d344fbb9b53c4b843 100644
--- a/chrome/renderer/media/cast_rtp_stream.cc
+++ b/chrome/renderer/media/cast_rtp_stream.cc
@@ -15,7 +15,6 @@
#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 "third_party/WebKit/public/platform/WebMediaStreamSource.h"
using media::cast::AudioSenderConfig;
@@ -80,9 +79,9 @@
config->bitrate = payload_params.max_bitrate;
config->aes_key = payload_params.aes_key;
config->aes_iv_mask = payload_params.aes_iv_mask;
- config->codec = media::cast::transport::kPcm16;
+ config->codec = media::cast::kPcm16;
if (payload_params.codec_name == kCodecNameOpus)
- config->codec = media::cast::transport::kOpus;
+ config->codec = media::cast::kOpus;
else
return false;
return true;
@@ -104,7 +103,7 @@
config->aes_key = payload_params.aes_key;
config->aes_iv_mask = payload_params.aes_iv_mask;
if (payload_params.codec_name == kCodecNameVp8)
- config->codec = media::cast::transport::kVp8;
+ config->codec = media::cast::kVp8;
else
return false;
return true;
« no previous file with comments | « no previous file | chrome/renderer/media/cast_session_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698