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

Unified Diff: trunk/src/media/cast/video_sender/codecs/vp8/vp8_encoder.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_sender/codecs/vp8/vp8_encoder.cc
===================================================================
--- trunk/src/media/cast/video_sender/codecs/vp8/vp8_encoder.cc (revision 243647)
+++ trunk/src/media/cast/video_sender/codecs/vp8/vp8_encoder.cc (working copy)
@@ -11,7 +11,6 @@
#include "base/logging.h"
#include "media/base/video_frame.h"
#include "media/cast/cast_defines.h"
-#include "media/cast/transport/cast_transport_config.h"
#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
namespace media {
@@ -128,7 +127,7 @@
}
bool Vp8Encoder::Encode(const scoped_refptr<media::VideoFrame>& video_frame,
- transport::EncodedVideoFrame* encoded_image) {
+ EncodedVideoFrame* encoded_image) {
// Image in vpx_image_t format.
// Input image is const. VP8's raw image is not defined as const.
raw_image_->planes[PLANE_Y] =
@@ -197,7 +196,7 @@
if (total_size == 0) return true;
// Populate the encoded frame.
- encoded_image->codec = transport::kVp8;
+ encoded_image->codec = kVp8;
encoded_image->last_referenced_frame_id = latest_frame_id_to_reference;
encoded_image->frame_id = ++last_encoded_frame_id_;

Powered by Google App Engine
This is Rietveld 408576698