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

Side by Side Diff: media/mojo/services/renderer_config_default.cc

Issue 839763002: fix builds with vpx and/or ffmpeg disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: last fixups Created 5 years, 11 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/media.gyp ('k') | media/test/pipeline_integration_test_base.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 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 "media/mojo/services/renderer_config.h" 5 #include "media/mojo/services/renderer_config.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "media/audio/audio_manager_base.h" 9 #include "media/audio/audio_manager_base.h"
10 #include "media/audio/audio_output_stream_sink.h" 10 #include "media/audio/audio_output_stream_sink.h"
11 #include "media/audio/fake_audio_log_factory.h" 11 #include "media/audio/fake_audio_log_factory.h"
12 #include "media/base/media.h" 12 #include "media/base/media.h"
13 #include "media/filters/opus_audio_decoder.h" 13 #include "media/filters/opus_audio_decoder.h"
14 14
15 #if !defined(OS_ANDROID) 15 #if !defined(MEDIA_DISABLE_FFMPEG)
16 #include "media/filters/ffmpeg_audio_decoder.h" 16 #include "media/filters/ffmpeg_audio_decoder.h"
17 #include "media/filters/ffmpeg_video_decoder.h" 17 #include "media/filters/ffmpeg_video_decoder.h"
18 #endif 18 #endif
19 19
20 #if !defined(MEDIA_DISABLE_LIBVPX) 20 #if !defined(MEDIA_DISABLE_LIBVPX)
21 #include "media/filters/vpx_video_decoder.h" 21 #include "media/filters/vpx_video_decoder.h"
22 #endif 22 #endif
23 23
24 namespace media { 24 namespace media {
25 namespace internal { 25 namespace internal {
(...skipping 22 matching lines...) Expand all
48 audio_manager->GetInputStreamParameters( 48 audio_manager->GetInputStreamParameters(
49 AudioManagerBase::kDefaultDeviceId), 49 AudioManagerBase::kDefaultDeviceId),
50 audio_manager->GetDefaultOutputStreamParameters())); 50 audio_manager->GetDefaultOutputStreamParameters()));
51 } 51 }
52 52
53 ScopedVector<AudioDecoder> GetAudioDecoders( 53 ScopedVector<AudioDecoder> GetAudioDecoders(
54 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 54 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
55 const LogCB& media_log_cb) override { 55 const LogCB& media_log_cb) override {
56 ScopedVector<AudioDecoder> audio_decoders; 56 ScopedVector<AudioDecoder> audio_decoders;
57 57
58 #if !defined(OS_ANDROID) 58 #if !defined(MEDIA_DISABLE_FFMPEG)
59 audio_decoders.push_back( 59 audio_decoders.push_back(
60 new FFmpegAudioDecoder(media_task_runner, media_log_cb)); 60 new FFmpegAudioDecoder(media_task_runner, media_log_cb));
61 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); 61 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
62 #endif 62 #endif
63 63
64 return audio_decoders.Pass(); 64 return audio_decoders.Pass();
65 } 65 }
66 66
67 ScopedVector<VideoDecoder> GetVideoDecoders( 67 ScopedVector<VideoDecoder> GetVideoDecoders(
68 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 68 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
69 const LogCB& media_log_cb) override { 69 const LogCB& media_log_cb) override {
70 ScopedVector<VideoDecoder> video_decoders; 70 ScopedVector<VideoDecoder> video_decoders;
71 71
72 // TODO(dalecurtis): If we ever need GPU video decoders, we'll need to 72 // TODO(dalecurtis): If we ever need GPU video decoders, we'll need to
73 // figure out how to retrieve the GpuVideoAcceleratorFactories... 73 // figure out how to retrieve the GpuVideoAcceleratorFactories...
74 74
75 #if !defined(MEDIA_DISABLE_LIBVPX) 75 #if !defined(MEDIA_DISABLE_LIBVPX)
76 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); 76 video_decoders.push_back(new VpxVideoDecoder(media_task_runner));
77 #endif // !defined(MEDIA_DISABLE_LIBVPX) 77 #endif
78 78
79 #if !defined(OS_ANDROID) 79 #if !defined(MEDIA_DISABLE_FFMPEG)
80 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); 80 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner));
81 #endif 81 #endif
82 82
83 return video_decoders.Pass(); 83 return video_decoders.Pass();
84 } 84 }
85 85
86 scoped_refptr<AudioRendererSink> GetAudioRendererSink() override { 86 scoped_refptr<AudioRendererSink> GetAudioRendererSink() override {
87 return new AudioOutputStreamSink(); 87 return new AudioOutputStreamSink();
88 } 88 }
89 89
90 const AudioHardwareConfig& GetAudioHardwareConfig() override { 90 const AudioHardwareConfig& GetAudioHardwareConfig() override {
91 return *audio_hardware_config_; 91 return *audio_hardware_config_;
92 } 92 }
93 93
94 private: 94 private:
95 FakeAudioLogFactory fake_audio_log_factory_; 95 FakeAudioLogFactory fake_audio_log_factory_;
96 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; 96 scoped_ptr<AudioHardwareConfig> audio_hardware_config_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(DefaultRendererConfig); 98 DISALLOW_COPY_AND_ASSIGN(DefaultRendererConfig);
99 }; 99 };
100 100
101 scoped_ptr<PlatformRendererConfig> CreatePlatformRendererConfig() { 101 scoped_ptr<PlatformRendererConfig> CreatePlatformRendererConfig() {
102 return make_scoped_ptr(new DefaultRendererConfig()); 102 return make_scoped_ptr(new DefaultRendererConfig());
103 } 103 }
104 104
105 } // namespace internal 105 } // namespace internal
106 } // namespace media 106 } // namespace media
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698