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

Unified Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.h

Issue 2585313002: Propagate MediaStreamTrack video content hints. (Closed)
Patch Set: fix test Created 4 years 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: content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
index 41a3563f3972a888dd0535fa9bccf41dda9beb33..d3f1c7c2e656da7eddd6e61d0f08f2aabd8c3d6e 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
@@ -16,6 +16,7 @@
#include "media/base/video_frame.h"
#include "media/base/video_frame_pool.h"
#include "media/capture/video_capture_types.h"
+#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/webrtc/media/base/videocapturer.h"
namespace content {
@@ -31,7 +32,9 @@ namespace content {
class CONTENT_EXPORT WebRtcVideoCapturerAdapter
: NON_EXPORTED_BASE(public cricket::VideoCapturer) {
public:
- explicit WebRtcVideoCapturerAdapter(bool is_screencast);
+ WebRtcVideoCapturerAdapter(
+ bool is_screencast,
+ blink::WebMediaStreamTrack::ContentHintType content_hint);
~WebRtcVideoCapturerAdapter() override;
// OnFrameCaptured delivers video frames to libjingle. It must be called on
@@ -39,6 +42,8 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter
// This method is virtual for testing purposes.
virtual void OnFrameCaptured(const scoped_refptr<media::VideoFrame>& frame);
+ void SetContentHint(blink::WebMediaStreamTrack::ContentHintType content_hint);
+
private:
// cricket::VideoCapturer implementation.
// These methods are accessed from a libJingle worker thread.
@@ -51,6 +56,8 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter
cricket::VideoFormat* best_format) override;
bool IsScreencast() const override;
+ bool ShouldAdaptResolution() const;
+
// Helper class used for copying texture backed frames.
class TextureFrameCopier;
const scoped_refptr<TextureFrameCopier> texture_copier_;
@@ -59,6 +66,7 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter
base::ThreadChecker thread_checker_;
const bool is_screencast_;
+ blink::WebMediaStreamTrack::ContentHintType content_hint_;
bool running_;
media::VideoFramePool scaled_frame_pool_;

Powered by Google App Engine
This is Rietveld 408576698