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

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

Issue 126843003: Revert of Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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: media/cast/video_sender/external_video_encoder.cc
diff --git a/media/cast/video_sender/external_video_encoder.cc b/media/cast/video_sender/external_video_encoder.cc
index 6bba936cbac7acda0a56120876596fc8abc66e91..4d6607a1c0450cb2c3a78ed3cd71732af81fdad7 100644
--- a/media/cast/video_sender/external_video_encoder.cc
+++ b/media/cast/video_sender/external_video_encoder.cc
@@ -12,7 +12,6 @@
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
#include "media/cast/cast_defines.h"
-#include "media/cast/transport/cast_transport_config.h"
#include "media/video/video_encode_accelerator.h"
namespace {
@@ -79,10 +78,10 @@
VideoCodecProfile output_profile = media::VIDEO_CODEC_PROFILE_UNKNOWN;
switch (video_config.codec) {
- case transport::kVp8:
+ case kVp8:
output_profile = media::VP8PROFILE_MAIN;
break;
- case transport::kH264:
+ case kH264:
output_profile = media::H264PROFILE_MAIN;
break;
}
@@ -264,8 +263,7 @@
NotifyError(media::VideoEncodeAccelerator::kPlatformFailureError);
return;
}
- scoped_ptr<transport::EncodedVideoFrame>
- encoded_frame(new transport::EncodedVideoFrame());
+ scoped_ptr<EncodedVideoFrame> encoded_frame(new EncodedVideoFrame());
encoded_frame->codec = codec_;
encoded_frame->key_frame = key_frame;
@@ -322,7 +320,7 @@
scoped_ptr<media::VideoEncodeAccelerator> video_encode_accelerator_;
int max_frame_rate_;
- transport::VideoCodec codec_;
+ VideoCodec codec_;
uint32 last_encoded_frame_id_;
// Shared memory buffers for input/output with the VideoAccelerator.
« no previous file with comments | « media/cast/video_sender/codecs/vp8/vp8_encoder.cc ('k') | media/cast/video_sender/external_video_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698