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

Unified Diff: trunk/src/media/cast/video_receiver/video_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
Index: trunk/src/media/cast/video_receiver/video_decoder.cc
===================================================================
--- trunk/src/media/cast/video_receiver/video_decoder.cc (revision 243647)
+++ trunk/src/media/cast/video_receiver/video_decoder.cc (working copy)
@@ -17,10 +17,10 @@
: codec_(video_config.codec),
vp8_decoder_() {
switch (video_config.codec) {
- case transport::kVp8:
+ case kVp8:
vp8_decoder_.reset(new Vp8Decoder(cast_environment));
break;
- case transport::kH264:
+ case kH264:
NOTIMPLEMENTED();
break;
}
@@ -28,11 +28,10 @@
VideoDecoder::~VideoDecoder() {}
-bool VideoDecoder::DecodeVideoFrame(
- const transport::EncodedVideoFrame* encoded_frame,
- const base::TimeTicks render_time,
- const VideoFrameDecodedCallback&
- frame_decoded_cb) {
+bool VideoDecoder::DecodeVideoFrame(const 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);
« no previous file with comments | « trunk/src/media/cast/video_receiver/video_decoder.h ('k') | trunk/src/media/cast/video_receiver/video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698