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

Side by Side Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

Issue 2932053002: Use C++11 alignment primitives (Closed)
Patch Set: Fix merge Created 3 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer/media/webrtc/webrtc_video_capturer_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/aligned_memory.h"
9 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
10 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
11 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
12 #include "base/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
13 #include "cc/paint/skia_paint_canvas.h" 12 #include "cc/paint/skia_paint_canvas.h"
14 #include "content/renderer/media/webrtc/webrtc_video_frame_adapter.h" 13 #include "content/renderer/media/webrtc/webrtc_video_frame_adapter.h"
15 #include "content/renderer/render_thread_impl.h" 14 #include "content/renderer/render_thread_impl.h"
16 #include "media/base/timestamp_constants.h" 15 #include "media/base/timestamp_constants.h"
17 #include "media/base/video_util.h" 16 #include "media/base/video_util.h"
18 #include "media/renderers/skcanvas_video_renderer.h" 17 #include "media/renderers/skcanvas_video_renderer.h"
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 // just use what is provided. 345 // just use what is provided.
347 // Use the desired format as the best format. 346 // Use the desired format as the best format.
348 best_format->width = desired.width; 347 best_format->width = desired.width;
349 best_format->height = desired.height; 348 best_format->height = desired.height;
350 best_format->fourcc = cricket::FOURCC_I420; 349 best_format->fourcc = cricket::FOURCC_I420;
351 best_format->interval = desired.interval; 350 best_format->interval = desired.interval;
352 return true; 351 return true;
353 } 352 }
354 353
355 } // namespace content 354 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_input_sync_writer_unittest.cc ('k') | media/base/audio_bus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698