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

Side by Side Diff: media/base/media.cc

Issue 2907563002: allocator/Windows: delete the old non-unified allocator-shim (Closed)
Patch Set: remove comment 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
« no previous file with comments | « media/base/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/base/media.h" 5 #include "media/base/media.h"
6 6
7 #include "base/allocator/features.h"
7 #include "base/command_line.h" 8 #include "base/command_line.h"
8 #include "base/macros.h" 9 #include "base/macros.h"
9 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
10 #include "base/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
11 #include "media/base/media_switches.h" 12 #include "media/base/media_switches.h"
12 #include "third_party/libyuv/include/libyuv.h" 13 #include "third_party/libyuv/include/libyuv.h"
13 14
14 #if defined(OS_ANDROID) 15 #if defined(OS_ANDROID)
15 #include "base/android/build_info.h" 16 #include "base/android/build_info.h"
16 #include "media/base/android/media_codec_util.h" 17 #include "media/base/android/media_codec_util.h"
(...skipping 15 matching lines...) Expand all
32 libyuv::InitCpuFlags(); 33 libyuv::InitCpuFlags();
33 34
34 #if !defined(MEDIA_DISABLE_FFMPEG) 35 #if !defined(MEDIA_DISABLE_FFMPEG)
35 // Initialize CPU flags outside of the sandbox as this may query /proc for 36 // Initialize CPU flags outside of the sandbox as this may query /proc for
36 // details on the current CPU for NEON, VFP, etc optimizations. 37 // details on the current CPU for NEON, VFP, etc optimizations.
37 av_get_cpu_flags(); 38 av_get_cpu_flags();
38 39
39 // Disable logging as it interferes with layout tests. 40 // Disable logging as it interferes with layout tests.
40 av_log_set_level(AV_LOG_QUIET); 41 av_log_set_level(AV_LOG_QUIET);
41 42
42 #if defined(ALLOCATOR_SHIM) 43 #if BUILDFLAG(USE_ALLOCATOR_SHIM)
43 // Remove allocation limit from ffmpeg, so calls go down to shim layer. 44 // Remove allocation limit from ffmpeg, so calls go down to shim layer.
44 av_max_alloc(0); 45 av_max_alloc(0);
45 #endif // defined(ALLOCATOR_SHIM) 46 #endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
46 47
47 #endif // !defined(MEDIA_DISABLE_FFMPEG) 48 #endif // !defined(MEDIA_DISABLE_FFMPEG)
48 } 49 }
49 50
50 #if defined(OS_ANDROID) 51 #if defined(OS_ANDROID)
51 void enable_platform_decoder_support() { 52 void enable_platform_decoder_support() {
52 has_platform_decoder_support_ = true; 53 has_platform_decoder_support_ = true;
53 } 54 }
54 55
55 bool has_platform_decoder_support() const { 56 bool has_platform_decoder_support() const {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 107
107 void DisableNewVp9CodecStringSupport_ForTesting() { 108 void DisableNewVp9CodecStringSupport_ForTesting() {
108 GetMediaInstance()->enable_new_vp9_codec_string_support(false); 109 GetMediaInstance()->enable_new_vp9_codec_string_support(false);
109 } 110 }
110 111
111 bool HasNewVp9CodecStringSupport() { 112 bool HasNewVp9CodecStringSupport() {
112 return GetMediaInstance()->has_new_vp9_codec_string_support(); 113 return GetMediaInstance()->has_new_vp9_codec_string_support();
113 } 114 }
114 115
115 } // namespace media 116 } // namespace media
OLDNEW
« no previous file with comments | « media/base/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698