Index: media/base/video_frame.cc |
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc |
index 089af93c0c88d11e68e5583fc94ac5163a9f6cca..7fc3fe669d240addb859fe9b61b26c9050aa244b 100644 |
--- a/media/base/video_frame.cc |
+++ b/media/base/video_frame.cc |
@@ -604,10 +604,10 @@ VideoFrame::VideoFrame(VideoFrame::Format format, |
VideoFrame::~VideoFrame() { |
if (!mailbox_holder_release_cb_.is_null()) { |
- std::vector<uint32> release_sync_points; |
+ std::map<std::string, 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); |
} |
@@ -707,12 +707,12 @@ base::SharedMemoryHandle VideoFrame::shared_memory_handle() const { |
return shared_memory_handle_; |
} |
-void VideoFrame::AppendReleaseSyncPoint(uint32 sync_point) { |
+void VideoFrame::AppendReleaseSyncPoint(std::string 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) |