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

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

Issue 1326153002: Add PIXEL_FORMAT_MT21. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 | « cc/resources/video_resource_updater.cc ('k') | media/base/video_frame.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h" 10 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 for (int format = 0; format < media::PIXEL_FORMAT_MAX; 145 for (int format = 0; format < media::PIXEL_FORMAT_MAX;
146 ++format) { 146 ++format) {
147 // Conversion from some formats are unsupported. 147 // Conversion from some formats are unsupported.
148 if (format == media::PIXEL_FORMAT_UNKNOWN || 148 if (format == media::PIXEL_FORMAT_UNKNOWN ||
149 format == media::PIXEL_FORMAT_YV16 || 149 format == media::PIXEL_FORMAT_YV16 ||
150 format == media::PIXEL_FORMAT_YV12A || 150 format == media::PIXEL_FORMAT_YV12A ||
151 format == media::PIXEL_FORMAT_YV24 || 151 format == media::PIXEL_FORMAT_YV24 ||
152 format == media::PIXEL_FORMAT_ARGB || 152 format == media::PIXEL_FORMAT_ARGB ||
153 format == media::PIXEL_FORMAT_XRGB || 153 format == media::PIXEL_FORMAT_XRGB ||
154 format == media::PIXEL_FORMAT_MJPEG) { 154 format == media::PIXEL_FORMAT_MJPEG ||
155 format == media::PIXEL_FORMAT_MT21) {
155 continue; 156 continue;
156 } 157 }
157 #if !defined(OS_LINUX) && !defined(OS_WIN) 158 #if !defined(OS_LINUX) && !defined(OS_WIN)
158 if (format == media::PIXEL_FORMAT_RGB24){ 159 if (format == media::PIXEL_FORMAT_RGB24){
159 continue; 160 continue;
160 } 161 }
161 #endif 162 #endif
162 media::VideoCaptureParams params; 163 media::VideoCaptureParams params;
163 params.requested_format = media::VideoCaptureFormat( 164 params.requested_format = media::VideoCaptureFormat(
164 capture_resolution, 30.0f, media::VideoPixelFormat(format)); 165 capture_resolution, 30.0f, media::VideoPixelFormat(format));
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 215
215 EXPECT_EQ(coded_size.width(), size_and_rotation.output_resolution.width()); 216 EXPECT_EQ(coded_size.width(), size_and_rotation.output_resolution.width());
216 EXPECT_EQ(coded_size.height(), 217 EXPECT_EQ(coded_size.height(),
217 size_and_rotation.output_resolution.height()); 218 size_and_rotation.output_resolution.height());
218 219
219 Mock::VerifyAndClearExpectations(controller_.get()); 220 Mock::VerifyAndClearExpectations(controller_.get());
220 } 221 }
221 } 222 }
222 223
223 } // namespace content 224 } // namespace content
OLDNEW
« no previous file with comments | « cc/resources/video_resource_updater.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698