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

Unified Diff: content/renderer/media/video_capture_impl.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: Fix ios build Created 6 years, 5 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 a9d6240ea1c5ad250666d5d34eccec37f5bdb243..1edc3d5d9f3168467daae4ca18e57c489aa1d353 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -213,8 +213,7 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
DCHECK_EQ(format.pixel_format, media::PIXEL_FORMAT_I420);
if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
- Send(new VideoCaptureHostMsg_BufferReady(
- device_id_, buffer_id, std::vector<uint32>()));
+ Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, 0));
return;
}
@@ -247,7 +246,7 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
weak_factory_.GetWeakPtr(),
buffer_id,
buffer,
- std::vector<uint32>())));
+ 0)));
for (ClientInfoMap::iterator it = clients_.begin(); it != clients_.end();
++it) {
@@ -265,8 +264,7 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
DCHECK(thread_checker_.CalledOnValidThread());
if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
- Send(new VideoCaptureHostMsg_BufferReady(
- device_id_, buffer_id, std::vector<uint32>()));
+ Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, 0));
return;
}
@@ -296,10 +294,10 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
void VideoCaptureImpl::OnClientBufferFinished(
int buffer_id,
const scoped_refptr<ClientBuffer>& /* ignored_buffer */,
- const std::vector<uint32>& release_sync_points) {
+ uint32 release_sync_point) {
DCHECK(thread_checker_.CalledOnValidThread());
Send(new VideoCaptureHostMsg_BufferReady(
- device_id_, buffer_id, release_sync_points));
+ device_id_, buffer_id, release_sync_point));
}
void VideoCaptureImpl::OnStateChanged(VideoCaptureState state) {
« 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