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

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

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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.cc
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index c0d5c7c7b39556231179d31b4b0f24bba16e9591..65d3d4ccede8d6d72ffc859396dab6b87777dc12 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -20,9 +20,7 @@
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/scale.h"
#include "third_party/skia/include/core/SkSurface.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/engine/webrtcvideoframe.h"
namespace content {
@@ -201,7 +199,7 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured(
// Return |frame| directly if it is texture backed, because there is no
// cropping support for texture yet. See http://crbug/503653.
if (frame->HasTextures()) {
- OnFrame(cricket::WebRtcVideoFrame(
+ OnFrame(webrtc::VideoFrame(
new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(
frame, base::Bind(&TextureFrameCopier::CopyTextureFrame,
texture_copier_)),
@@ -230,7 +228,7 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured(
// If no scaling is needed, return a wrapped version of |frame| directly.
if (video_frame->natural_size() == video_frame->visible_rect().size()) {
- OnFrame(cricket::WebRtcVideoFrame(
+ OnFrame(webrtc::VideoFrame(
new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(
video_frame,
WebRtcVideoFrameAdapter::CopyTextureFrameCallback()),
@@ -260,7 +258,7 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured(
scaled_frame->stride(media::VideoFrame::kVPlane),
adapted_width, adapted_height, libyuv::kFilterBilinear);
- OnFrame(cricket::WebRtcVideoFrame(
+ OnFrame(webrtc::VideoFrame(
new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(
scaled_frame,
WebRtcVideoFrameAdapter::CopyTextureFrameCallback()),

Powered by Google App Engine
This is Rietveld 408576698