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

Unified Diff: content/renderer/media/capture_video_decoder.h

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix content_unittests build failure Created 8 years, 8 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 | « no previous file | content/renderer/media/capture_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/capture_video_decoder.h
diff --git a/content/renderer/media/capture_video_decoder.h b/content/renderer/media/capture_video_decoder.h
index 60af5a60724d95c7f055d692877af069753ac513..d4bbd25fa58af7741dd87381edf6b6b0714fb8c3 100644
--- a/content/renderer/media/capture_video_decoder.h
+++ b/content/renderer/media/capture_video_decoder.h
@@ -12,6 +12,7 @@
#include "media/base/pipeline_status.h"
#include "media/base/video_frame.h"
#include "media/video/capture/video_capture.h"
+#include "media/video/capture/video_capture_types.h"
namespace base {
class MessageLoopProxy;
@@ -28,7 +29,7 @@ class CONTENT_EXPORT CaptureVideoDecoder
base::MessageLoopProxy* message_loop_proxy,
media::VideoCaptureSessionId video_stream_id,
VideoCaptureImplManager* vc_manager,
- const media::VideoCapture::VideoCaptureCapability& capability);
+ const media::VideoCaptureCapability& capability);
virtual ~CaptureVideoDecoder();
// Filter implementation.
@@ -96,7 +97,7 @@ class CONTENT_EXPORT CaptureVideoDecoder
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
scoped_refptr<VideoCaptureImplManager> vc_manager_;
- media::VideoCapture::VideoCaptureCapability capability_;
+ media::VideoCaptureCapability capability_;
gfx::Size natural_size_;
DecoderState state_;
bool got_first_frame_;
« no previous file with comments | « no previous file | content/renderer/media/capture_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698