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

Unified Diff: content/renderer/media/video_capture_impl.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
« no previous file with comments | « content/renderer/media/video_capture_impl.h ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 122fc06787ecb954884bb3180269df58752081cd..e02be5c48f26f21645229494d1c16bd709af2b11 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -214,7 +214,7 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
Send(new VideoCaptureHostMsg_BufferReady(
- device_id_, buffer_id, std::vector<uint32>()));
+ device_id_, buffer_id, std::map<std::string, uint32>()));
return;
}
@@ -247,7 +247,7 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
weak_factory_.GetWeakPtr(),
buffer_id,
buffer,
- std::vector<uint32>())));
+ std::map<std::string, uint32>())));
for (ClientInfoMap::iterator it = clients_.begin(); it != clients_.end();
++it) {
@@ -266,7 +266,7 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
Send(new VideoCaptureHostMsg_BufferReady(
- device_id_, buffer_id, std::vector<uint32>()));
+ device_id_, buffer_id, std::map<std::string, uint32>()));
return;
}
@@ -296,7 +296,7 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
void VideoCaptureImpl::OnClientBufferFinished(
int buffer_id,
const scoped_refptr<ClientBuffer>& /* ignored_buffer */,
- const std::vector<uint32>& release_sync_points) {
+ const std::map<std::string, uint32>& release_sync_points) {
DCHECK(thread_checker_.CalledOnValidThread());
Send(new VideoCaptureHostMsg_BufferReady(
device_id_, buffer_id, release_sync_points));
« no previous file with comments | « content/renderer/media/video_capture_impl.h ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698