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

Side by Side Diff: content/browser/renderer_host/media/video_capture_host.cc

Issue 2428263004: 16 bpp video stream capture, render and createImageBitmap(video) using (CPU) shared memory buffers (Closed)
Patch Set: review #30 fix. Thanks danakj@. Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/video_capture_host.h" 5 #include "content/browser/renderer_host/media/video_capture_host.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 if (controllers_.find(controller_id) == controllers_.end()) 90 if (controllers_.find(controller_id) == controllers_.end())
91 return; 91 return;
92 92
93 if (!base::ContainsKey(device_id_to_observer_map_, controller_id)) 93 if (!base::ContainsKey(device_id_to_observer_map_, controller_id))
94 return; 94 return;
95 95
96 mojom::VideoFrameInfoPtr info = mojom::VideoFrameInfo::New(); 96 mojom::VideoFrameInfoPtr info = mojom::VideoFrameInfo::New();
97 info->timestamp = video_frame->timestamp(); 97 info->timestamp = video_frame->timestamp();
98 video_frame->metadata()->MergeInternalValuesInto(&info->metadata); 98 video_frame->metadata()->MergeInternalValuesInto(&info->metadata);
99 99
100 DCHECK_EQ(media::PIXEL_FORMAT_I420, video_frame->format()); 100 DCHECK(media::PIXEL_FORMAT_I420 == video_frame->format() ||
101 info->pixel_format = media::PIXEL_FORMAT_I420; 101 media::PIXEL_FORMAT_Y16 == video_frame->format());
102 info->pixel_format = video_frame->format();
102 info->storage_type = media::PIXEL_STORAGE_CPU; 103 info->storage_type = media::PIXEL_STORAGE_CPU;
103 info->coded_size = video_frame->coded_size(); 104 info->coded_size = video_frame->coded_size();
104 info->visible_rect = video_frame->visible_rect(); 105 info->visible_rect = video_frame->visible_rect();
105 106
106 device_id_to_observer_map_[controller_id]->OnBufferReady(buffer_id, 107 device_id_to_observer_map_[controller_id]->OnBufferReady(buffer_id,
107 std::move(info)); 108 std::move(info));
108 } 109 }
109 110
110 void VideoCaptureHost::OnEnded(VideoCaptureControllerID controller_id) { 111 void VideoCaptureHost::OnEnded(VideoCaptureControllerID controller_id) {
111 DVLOG(1) << __func__; 112 DVLOG(1) << __func__;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 const base::WeakPtr<VideoCaptureController> controller = it->second; 326 const base::WeakPtr<VideoCaptureController> controller = it->second;
326 controllers_.erase(it); 327 controllers_.erase(it);
327 if (!controller) 328 if (!controller)
328 return; 329 return;
329 330
330 media_stream_manager_->video_capture_manager()->StopCaptureForClient( 331 media_stream_manager_->video_capture_manager()->StopCaptureForClient(
331 controller.get(), controller_id, this, on_error); 332 controller.get(), controller_id, this, on_error);
332 } 333 }
333 334
334 } // namespace content 335 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698