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

Unified Diff: content/browser/renderer_host/media/video_capture_controller.cc

Issue 313623003: WIP: Option2: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index 4775a77c061688c4dfb76d33b847fd23be70eeaf..842c3579e28f5d35359ee97882e6f3ac9cb29f93 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -249,7 +249,7 @@ void VideoCaptureController::ReturnBuffer(
const VideoCaptureControllerID& id,
VideoCaptureControllerEventHandler* event_handler,
int buffer_id,
- const std::vector<uint32>& sync_points) {
+ const std::map<std::string, uint32>& sync_points) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
ControllerClient* client = FindClient(id, event_handler, controller_clients_);
@@ -266,8 +266,12 @@ void VideoCaptureController::ReturnBuffer(
client->active_buffers.erase(iter);
if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) {
- for (size_t i = 0; i < sync_points.size(); i++)
- frame->AppendReleaseSyncPoint(sync_points[i]);
+ for (std::map<std::string, uint32>::const_iterator iter =
+ sync_points.begin();
+ iter != sync_points.end();
+ iter++) {
+ frame->AppendReleaseSyncPoint(iter->first, iter->second);
+ }
}
buffer_pool_->RelinquishConsumerHold(buffer_id, 1);

Powered by Google App Engine
This is Rietveld 408576698