content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc - Issue 1669023004: Roll WebRTC 11486:11495, Libjingle 11485:11495

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1669023004: Roll WebRTC 11486:11495, Libjingle 11485:11495 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update includes in content and remoting Created 4 years, 10 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:

Index: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

index abdb1b17fa9a531446f447b85df2d7cf12b12ec1..8a9a2cf23c221cacf7320f62945d37f43d7914b2 100644

--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

@@ -11,12 +11,12 @@

#include "media/base/timestamp_constants.h"

#include "media/base/video_frame.h"

#include "media/base/video_frame_pool.h"

-#include "third_party/libjingle/source/talk/media/base/videoframefactory.h"

-#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h"

#include "third_party/libyuv/include/libyuv/convert_from.h"

#include "third_party/libyuv/include/libyuv/scale.h"

#include "third_party/webrtc/common_video/include/video_frame_buffer.h"

#include "third_party/webrtc/common_video/rotation.h"

+#include "third_party/webrtc/media/base/videoframefactory.h"

+#include "third_party/webrtc/media/webrtc/webrtcvideoframe.h"

namespace content {

namespace {