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

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

Issue 604743005: VideoCapture: Remove deep frame copy in the border to libJingle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tommi@s comments Created 6 years, 2 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: 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 52245526d3b6fd0e8edf4295dfa910c7cd39ed98..4a221cef0c8933dc0deb4a122a7f31858d9be0cd 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
@@ -15,6 +15,10 @@
#include "media/video/capture/video_capture_types.h"
#include "third_party/libjingle/source/talk/media/base/videocapturer.h"
+namespace {
+class MediaVideoFrameFactory;
perkj_chrome 2014/10/16 07:55:09 nit: forward declare just before you use it line 6
magjed_chromium 2014/10/16 10:35:47 I want to have it in an anonymous namespace and no
+}
+
namespace content {
// WebRtcVideoCapturerAdapter implements a simple cricket::VideoCapturer that is
@@ -48,19 +52,16 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter
cricket::VideoFormat* best_format) override;
virtual bool IsScreencast() const override;
- void UpdateI420Buffer(const scoped_refptr<media::VideoFrame>& src);
-
// |thread_checker_| is bound to the libjingle worker thread.
base::ThreadChecker thread_checker_;
const bool is_screencast_;
bool running_;
base::TimeDelta first_frame_timestamp_;
- // |buffer_| used if cropping is needed. It is created only if needed and
- // owned by WebRtcVideoCapturerAdapter. If its created, it exists until
- // WebRtcVideoCapturerAdapter is destroyed.
- uint8* buffer_;
- size_t buffer_size_;
+
+ // This is an alias to the frame_factory_ in the base class
+ // cricket::VideoCapturer.
+ MediaVideoFrameFactory* frame_factory_;
DISALLOW_COPY_AND_ASSIGN(WebRtcVideoCapturerAdapter);
};

Powered by Google App Engine
This is Rietveld 408576698