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

Unified Diff: media/cast/video_sender/video_encoder.h

Issue 25544003: Fix code style and gyp files in cast to build cast_unittest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed gyp files Created 7 years, 3 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/video_sender/mock_video_encoder_controller.cc ('k') | media/cast/video_sender/video_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_sender/video_encoder.h
diff --git a/media/cast/video_sender/video_encoder.h b/media/cast/video_sender/video_encoder.h
index d3b261e10336301a79f65fa74e9a823682776b46..d3089bd8e129d1dc389b6a4de4b8613dbd61a950 100644
--- a/media/cast/video_sender/video_encoder.h
+++ b/media/cast/video_sender/video_encoder.h
@@ -27,8 +27,6 @@ class VideoEncoder : public VideoEncoderController,
const VideoSenderConfig& video_config,
uint8 max_unacked_frames);
- virtual ~VideoEncoder();
-
// Called from the main cast thread. This function post the encode task to the
// video encoder thread;
// The video_frame must be valid until the closure callback is called.
@@ -42,6 +40,8 @@ class VideoEncoder : public VideoEncoderController,
const base::Closure frame_release_callback);
protected:
+ virtual ~VideoEncoder();
+
struct CodecDynamicConfig {
bool key_frame_requested;
uint8 latest_frame_id_to_reference;
@@ -64,6 +64,8 @@ class VideoEncoder : public VideoEncoderController,
virtual int NumberOfSkippedFrames() const OVERRIDE;
private:
+ friend class base::RefCountedThreadSafe<VideoEncoder>;
+
const VideoSenderConfig video_config_;
scoped_refptr<CastThread> cast_thread_;
scoped_ptr<Vp8Encoder> vp8_encoder_;
« no previous file with comments | « media/cast/video_sender/mock_video_encoder_controller.cc ('k') | media/cast/video_sender/video_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698