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

Unified Diff: media/cast/video_sender/video_encoder.cc

Issue 109413004: Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Injecting TaskRunner 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/video_sender/video_encoder.cc
diff --git a/media/cast/video_sender/video_encoder.cc b/media/cast/video_sender/video_encoder.cc
index eb0cf4948672049fd40ce149dd9e87335264c620..9c8f915134be56a0cc57f3543331823b8de62681 100644
--- a/media/cast/video_sender/video_encoder.cc
+++ b/media/cast/video_sender/video_encoder.cc
@@ -27,7 +27,7 @@ VideoEncoder::VideoEncoder(scoped_refptr<CastEnvironment> cast_environment,
cast_environment_(cast_environment),
skip_next_frame_(false),
skip_count_(0) {
- if (video_config.codec == kVp8) {
+ if (video_config.codec == transport::kVp8) {
vp8_encoder_.reset(new Vp8Encoder(video_config, max_unacked_frames));
} else {
DCHECK(false) << "Invalid config"; // Codec not supported.
@@ -45,7 +45,7 @@ bool VideoEncoder::EncodeVideoFrame(
const base::TimeTicks& capture_time,
const FrameEncodedCallback& frame_encoded_callback) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
- if (video_config_.codec != kVp8) return false;
+ if (video_config_.codec != transport::kVp8) return false;
if (skip_next_frame_) {
++skip_count_;
@@ -78,7 +78,8 @@ void VideoEncoder::EncodeVideoFrameEncoderThread(
dynamic_config.latest_frame_id_to_reference);
vp8_encoder_->UpdateRates(dynamic_config.bit_rate);
- scoped_ptr<EncodedVideoFrame> encoded_frame(new EncodedVideoFrame());
+ scoped_ptr<transport::EncodedVideoFrame> encoded_frame(
+ new transport::EncodedVideoFrame());
bool retval = vp8_encoder_->Encode(video_frame, encoded_frame.get());
cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698