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

Unified Diff: media/cast/video_receiver/video_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/video_receiver/video_decoder.cc
diff --git a/media/cast/video_receiver/video_decoder.cc b/media/cast/video_receiver/video_decoder.cc
index 360cdaa36e9442b9cbdf8d2ad05631ed9b5053d0..9715be296d020ae180188d8574ad3eb6781525cd 100644
--- a/media/cast/video_receiver/video_decoder.cc
+++ b/media/cast/video_receiver/video_decoder.cc
@@ -17,13 +17,13 @@ VideoDecoder::VideoDecoder(const VideoReceiverConfig& video_config,
: codec_(video_config.codec),
vp8_decoder_() {
switch (video_config.codec) {
- case kVp8:
+ case transport::kVp8:
vp8_decoder_.reset(new Vp8Decoder(cast_environment));
break;
- case kH264:
+ case transport::kH264:
NOTIMPLEMENTED();
break;
- case kExternalVideo:
+ case transport::kExternalVideo:
DCHECK(false) << "Invalid codec";
break;
}
@@ -31,10 +31,11 @@ VideoDecoder::VideoDecoder(const VideoReceiverConfig& video_config,
VideoDecoder::~VideoDecoder() {}
-bool VideoDecoder::DecodeVideoFrame(const EncodedVideoFrame* encoded_frame,
- const base::TimeTicks render_time,
- const VideoFrameDecodedCallback&
- frame_decoded_cb) {
+bool VideoDecoder::DecodeVideoFrame(
+ const transport::EncodedVideoFrame* encoded_frame,
+ const base::TimeTicks render_time,
+ const VideoFrameDecodedCallback&
+ frame_decoded_cb) {
DCHECK(encoded_frame->codec == codec_) << "Invalid codec";
DCHECK_GT(encoded_frame->data.size(), GG_UINT64_C(0)) << "Empty video frame";
return vp8_decoder_->Decode(encoded_frame, render_time, frame_decoded_cb);

Powered by Google App Engine
This is Rietveld 408576698