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

Unified Diff: webrtc/media/base/videoadapter.cc

Issue 1973873003: Delete AndroidVideoCapturer::FrameFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Address nits. Created 4 years, 7 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: webrtc/media/base/videoadapter.cc
diff --git a/webrtc/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
index 9c3837c5729bc4b48531689c36ed2e0a9206afc7..dec42a24cd00816a98efe3468c22bd6b9e65d7b7 100644
--- a/webrtc/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -132,7 +132,7 @@ void VideoAdapter::SetExpectedInputFrameInterval(int64_t interval) {
input_interval_ = interval;
}
-void VideoAdapter::AdaptFrameResolution(int in_width,
+bool VideoAdapter::AdaptFrameResolution(int in_width,
int in_height,
int* cropped_width,
int* cropped_height,
@@ -185,11 +185,7 @@ void VideoAdapter::AdaptFrameResolution(int in_width,
}
// Drop frame.
- *cropped_width = 0;
- *cropped_height = 0;
- *out_width = 0;
- *out_height = 0;
- return;
+ return false;
}
// Calculate how the input should be cropped.
@@ -246,6 +242,8 @@ void VideoAdapter::AdaptFrameResolution(int in_width,
previous_width_ = *out_width;
previous_height_ = *out_height;
+
+ return true;
}
void VideoAdapter::OnOutputFormatRequest(const VideoFormat& format) {

Powered by Google App Engine
This is Rietveld 408576698