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

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

Issue 23693004: Change Mac Video Capture format change ARGB->YUY2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected the CVPixelFormat to UYUV Created 7 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/video/capture/mac/video_capture_device_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_controller.h" 5 #include "content/browser/renderer_host/media/video_capture_controller.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 origin_colorspace = libyuv::FOURCC_YV12; 315 origin_colorspace = libyuv::FOURCC_YV12;
316 break; 316 break;
317 case media::PIXEL_FORMAT_NV21: 317 case media::PIXEL_FORMAT_NV21:
318 DCHECK(!chopped_width_ && !chopped_height_); 318 DCHECK(!chopped_width_ && !chopped_height_);
319 origin_colorspace = libyuv::FOURCC_NV12; 319 origin_colorspace = libyuv::FOURCC_NV12;
320 break; 320 break;
321 case media::PIXEL_FORMAT_YUY2: 321 case media::PIXEL_FORMAT_YUY2:
322 DCHECK(!chopped_width_ && !chopped_height_); 322 DCHECK(!chopped_width_ && !chopped_height_);
323 origin_colorspace = libyuv::FOURCC_YUY2; 323 origin_colorspace = libyuv::FOURCC_YUY2;
324 break; 324 break;
325 case media::PIXEL_FORMAT_UYVY:
326 DCHECK(!chopped_width_ && !chopped_height_);
327 origin_colorspace = libyuv::FOURCC_UYVY;
328 break;
325 case media::PIXEL_FORMAT_RGB24: 329 case media::PIXEL_FORMAT_RGB24:
326 origin_colorspace = libyuv::FOURCC_RAW; 330 origin_colorspace = libyuv::FOURCC_RAW;
327 break; 331 break;
328 case media::PIXEL_FORMAT_ARGB: 332 case media::PIXEL_FORMAT_ARGB:
329 origin_colorspace = libyuv::FOURCC_ARGB; 333 origin_colorspace = libyuv::FOURCC_ARGB;
330 break; 334 break;
331 case media::PIXEL_FORMAT_MJPEG: 335 case media::PIXEL_FORMAT_MJPEG:
332 origin_colorspace = libyuv::FOURCC_MJPG; 336 origin_colorspace = libyuv::FOURCC_MJPG;
333 break; 337 break;
334 default: 338 default:
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 controller_clients_.push_back((*client_it)); 843 controller_clients_.push_back((*client_it));
840 pending_clients_.erase(client_it++); 844 pending_clients_.erase(client_it++);
841 } 845 }
842 // Request the manager to start the actual capture. 846 // Request the manager to start the actual capture.
843 video_capture_manager_->Start(current_params_, this); 847 video_capture_manager_->Start(current_params_, this);
844 state_ = VIDEO_CAPTURE_STATE_STARTED; 848 state_ = VIDEO_CAPTURE_STATE_STARTED;
845 device_in_use_ = true; 849 device_in_use_ = true;
846 } 850 }
847 851
848 } // namespace content 852 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/video/capture/mac/video_capture_device_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698