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

Unified Diff: media/base/video_frame.cc

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make VideoFrame keep only one sync point per client Created 6 years, 6 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: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 272d41dc4c691597a227abbaab023a31a86fc98d..5700dc18477e7ca85023d7e532a064334abccfcf 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -650,10 +650,10 @@ VideoFrame::VideoFrame(VideoFrame::Format format,
VideoFrame::~VideoFrame() {
if (!mailbox_holder_release_cb_.is_null()) {
- std::vector<uint32> release_sync_points;
+ std::map<uintptr_t, uint32> release_sync_points;
{
base::AutoLock locker(release_sync_point_lock_);
- release_sync_points_.swap(release_sync_points);
+ release_sync_point_map_.swap(release_sync_points);
}
base::ResetAndReturn(&mailbox_holder_release_cb_).Run(release_sync_points);
}
@@ -807,12 +807,12 @@ base::SharedMemoryHandle VideoFrame::shared_memory_handle() const {
return shared_memory_handle_;
}
-void VideoFrame::AppendReleaseSyncPoint(uint32 sync_point) {
+void VideoFrame::AppendReleaseSyncPoint(uintptr_t client, uint32 sync_point) {
DCHECK_EQ(format_, NATIVE_TEXTURE);
if (!sync_point)
return;
base::AutoLock locker(release_sync_point_lock_);
- release_sync_points_.push_back(sync_point);
+ release_sync_point_map_[client] = sync_point;
}
#if defined(OS_POSIX)

Powered by Google App Engine
This is Rietveld 408576698