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

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 nit. Delete left-over include. 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
« no previous file with comments | « webrtc/media/base/videoadapter.h ('k') | webrtc/media/base/videoadapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videoadapter.cc
diff --git a/webrtc/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
index e1f506f10b0eec15e66930959d40df9a1d6c94f4..acb0e2c1a19888d758cd2d46893fca9e2b93a477 100644
--- a/webrtc/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -153,7 +153,7 @@ bool VideoAdapter::KeepFrame(int64_t in_timestamp_ns) {
return true;
}
-void VideoAdapter::AdaptFrameResolution(int in_width,
+bool VideoAdapter::AdaptFrameResolution(int in_width,
int in_height,
int64_t in_timestamp_ns,
int* cropped_width,
@@ -189,11 +189,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.
@@ -250,6 +246,8 @@ void VideoAdapter::AdaptFrameResolution(int in_width,
previous_width_ = *out_width;
previous_height_ = *out_height;
+
+ return true;
}
void VideoAdapter::OnOutputFormatRequest(const VideoFormat& format) {
« no previous file with comments | « webrtc/media/base/videoadapter.h ('k') | webrtc/media/base/videoadapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698