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

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

Issue 183113004: Make sure MediaStreamVideoSource support cropping. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed extra spaces in content_unittests Created 6 years, 9 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 | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_video_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_video_source.h
diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h
index 6f4fc442aafaa4621ba7f6d05ad6b47f1a730cd8..4164ffbdf05cbb90c4813bca33fb60549ab11e12 100644
--- a/content/renderer/media/media_stream_video_source.h
+++ b/content/renderer/media/media_stream_video_source.h
@@ -12,6 +12,7 @@
#include "content/renderer/media/media_stream_dependency_factory.h"
#include "content/renderer/media/media_stream_source.h"
#include "media/base/video_frame.h"
+#include "media/base/video_frame_pool.h"
#include "media/video/capture/video_capture_types.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
@@ -118,11 +119,13 @@ class CONTENT_EXPORT MediaStreamVideoSource
// Finds the first constraints in |requested_constraints_| that can be
// fulfilled. |best_format| is set to the video resolution that can be
- // fulfilled. |resulting_constraints| is set to the found constraints in
+ // fulfilled. |frame_output_size| is the requested frame size after cropping.
+ // |resulting_constraints| is set to the found constraints in
// |requested_constraints_|.
bool FindBestFormatWithConstraints(
const media::VideoCaptureFormats& formats,
media::VideoCaptureFormat* best_format,
+ gfx::Size* frame_output_size,
blink::WebMediaConstraints* resulting_constraints);
// Trigger all cached callbacks from AddTrack. AddTrack is successful
@@ -141,6 +144,7 @@ class CONTENT_EXPORT MediaStreamVideoSource
media::VideoCaptureFormat current_format_;
blink::WebMediaConstraints current_constraints_;
+ gfx::Size frame_output_size_;
struct RequestedConstraints {
RequestedConstraints(const blink::WebMediaConstraints& constraints,
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_video_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698