| 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);
|
|
|