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

Side by Side Diff: media/filters/vpx_video_decoder.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « media/filters/stream_parser_factory.cc ('k') | media/formats/common/offset_byte_queue.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 (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 "media/filters/vpx_video_decoder.h" 5 #include "media/filters/vpx_video_decoder.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback_helpers.h" 12 #include "base/callback_helpers.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/sys_byteorder.h" 19 #include "base/sys_byteorder.h"
20 #include "base/sys_info.h" 20 #include "base/sys_info.h"
21 #include "base/trace_event/trace_event.h" 21 #include "base/trace_event/trace_event.h"
22 #include "media/base/bind_to_current_loop.h" 22 #include "media/base/bind_to_current_loop.h"
23 #include "media/base/decoder_buffer.h" 23 #include "media/base/decoder_buffer.h"
24 #include "media/base/demuxer_stream.h"
25 #include "media/base/limits.h" 24 #include "media/base/limits.h"
26 #include "media/base/media_switches.h" 25 #include "media/base/media_switches.h"
27 #include "media/base/pipeline.h" 26 #include "media/base/pipeline.h"
28 #include "media/base/video_decoder_config.h"
29 #include "media/base/video_frame.h"
30 #include "media/base/video_util.h" 27 #include "media/base/video_util.h"
31 28
32 // Include libvpx header files. 29 // Include libvpx header files.
33 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide 30 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
34 // backwards compatibility for legacy applications using the library. 31 // backwards compatibility for legacy applications using the library.
35 #define VPX_CODEC_DISABLE_COMPAT 1 32 #define VPX_CODEC_DISABLE_COMPAT 1
36 extern "C" { 33 extern "C" {
37 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" 34 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
38 #include "third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h" 35 #include "third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h"
39 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" 36 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get()); 521 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
525 return; 522 return;
526 } 523 }
527 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y], 524 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
528 vpx_image_alpha->stride[VPX_PLANE_Y], 525 vpx_image_alpha->stride[VPX_PLANE_Y],
529 vpx_image_alpha->d_h, 526 vpx_image_alpha->d_h,
530 video_frame->get()); 527 video_frame->get());
531 } 528 }
532 529
533 } // namespace media 530 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/stream_parser_factory.cc ('k') | media/formats/common/offset_byte_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698