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

Unified Diff: media/cast/receiver/video_decoder.cc

Issue 308043006: [Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed hclam's comments. Created 6 years, 7 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 | « media/cast/receiver/video_decoder.h ('k') | media/cast/receiver/video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/receiver/video_decoder.cc
diff --git a/media/cast/video_receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc
similarity index 98%
rename from media/cast/video_receiver/video_decoder.cc
rename to media/cast/receiver/video_decoder.cc
index c2d256268f645b387e3788c4d843851128d14b45..41c97e15a7bbdfafb1e2d45851fcca35ace740cb 100644
--- a/media/cast/video_receiver/video_decoder.cc
+++ b/media/cast/receiver/video_decoder.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/cast/video_receiver/video_decoder.h"
+#include "media/cast/receiver/video_decoder.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -209,9 +209,9 @@ class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase {
VideoDecoder::VideoDecoder(
const scoped_refptr<CastEnvironment>& cast_environment,
- const FrameReceiverConfig& video_config)
+ transport::VideoCodec codec)
: cast_environment_(cast_environment) {
- switch (video_config.codec.video) {
+ switch (codec) {
#ifndef OFFICIAL_BUILD
case transport::kFakeSoftwareVideo:
impl_ = new FakeImpl(cast_environment);
« no previous file with comments | « media/cast/receiver/video_decoder.h ('k') | media/cast/receiver/video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698