OLD | NEW |
---|---|
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 |
(...skipping 18 matching lines...) Expand all Loading... | |
29 #include "media/base/media_switches.h" | 29 #include "media/base/media_switches.h" |
30 #include "media/base/pipeline.h" | 30 #include "media/base/pipeline.h" |
31 #include "media/base/timestamp_constants.h" | 31 #include "media/base/timestamp_constants.h" |
32 #include "media/base/video_util.h" | 32 #include "media/base/video_util.h" |
33 | 33 |
34 // Include libvpx header files. | 34 // Include libvpx header files. |
35 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide | 35 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide |
36 // backwards compatibility for legacy applications using the library. | 36 // backwards compatibility for legacy applications using the library. |
37 #define VPX_CODEC_DISABLE_COMPAT 1 | 37 #define VPX_CODEC_DISABLE_COMPAT 1 |
38 extern "C" { | 38 extern "C" { |
39 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" | 39 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h" |
40 #include "third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h" | 40 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_frame_buffer.h" |
41 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" | 41 #include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h" |
Johann
2015/09/17 16:32:18
presubmit would like vp8 before vpx
| |
42 } | 42 } |
43 | 43 |
44 namespace media { | 44 namespace media { |
45 | 45 |
46 // Always try to use three threads for video decoding. There is little reason | 46 // Always try to use three threads for video decoding. There is little reason |
47 // not to since current day CPUs tend to be multi-core and we measured | 47 // not to since current day CPUs tend to be multi-core and we measured |
48 // performance benefits on older machines such as P4s with hyperthreading. | 48 // performance benefits on older machines such as P4s with hyperthreading. |
49 static const int kDecodeThreads = 2; | 49 static const int kDecodeThreads = 2; |
50 static const int kMaxDecodeThreads = 16; | 50 static const int kMaxDecodeThreads = 16; |
51 | 51 |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
576 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get()); | 576 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get()); |
577 return; | 577 return; |
578 } | 578 } |
579 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y], | 579 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y], |
580 vpx_image_alpha->stride[VPX_PLANE_Y], | 580 vpx_image_alpha->stride[VPX_PLANE_Y], |
581 vpx_image_alpha->d_h, | 581 vpx_image_alpha->d_h, |
582 video_frame->get()); | 582 video_frame->get()); |
583 } | 583 } |
584 | 584 |
585 } // namespace media | 585 } // namespace media |
OLD | NEW |