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

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

Issue 2808743004: Include builtin_audio_encoder_factory.h in peer_connection_dependency_factory.cc (Closed)
Patch Set: Added builtin_audio_encoder_factory to deps and moved builtin_audio_decoder_factory. Created 3 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 | « content/renderer/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 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/peer_connection_dependency_factory.h" 5 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "media/filters/ffmpeg_glue.h" 56 #include "media/filters/ffmpeg_glue.h"
57 #include "media/renderers/gpu_video_accelerator_factories.h" 57 #include "media/renderers/gpu_video_accelerator_factories.h"
58 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" 58 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
59 #include "third_party/WebKit/public/platform/WebMediaStream.h" 59 #include "third_party/WebKit/public/platform/WebMediaStream.h"
60 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 60 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
61 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 61 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
62 #include "third_party/WebKit/public/platform/WebURL.h" 62 #include "third_party/WebKit/public/platform/WebURL.h"
63 #include "third_party/WebKit/public/web/WebDocument.h" 63 #include "third_party/WebKit/public/web/WebDocument.h"
64 #include "third_party/WebKit/public/web/WebFrame.h" 64 #include "third_party/WebKit/public/web/WebFrame.h"
65 #include "third_party/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" 65 #include "third_party/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
66 #include "third_party/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
66 #include "third_party/webrtc/api/mediaconstraintsinterface.h" 67 #include "third_party/webrtc/api/mediaconstraintsinterface.h"
67 #include "third_party/webrtc/api/videosourceproxy.h" 68 #include "third_party/webrtc/api/videosourceproxy.h"
68 #include "third_party/webrtc/base/ssladapter.h" 69 #include "third_party/webrtc/base/ssladapter.h"
69 #include "third_party/webrtc/modules/video_coding/codecs/h264/include/h264.h" 70 #include "third_party/webrtc/modules/video_coding/codecs/h264/include/h264.h"
70 71
71 #if defined(OS_ANDROID) 72 #if defined(OS_ANDROID)
72 #include "media/base/android/media_codec_util.h" 73 #include "media/base/android/media_codec_util.h"
73 #endif 74 #endif
74 75
75 namespace content { 76 namespace content {
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 555
555 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() { 556 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
556 DCHECK(CalledOnValidThread()); 557 DCHECK(CalledOnValidThread());
557 if (audio_device_.get()) 558 if (audio_device_.get())
558 return; 559 return;
559 560
560 audio_device_ = new WebRtcAudioDeviceImpl(); 561 audio_device_ = new WebRtcAudioDeviceImpl();
561 } 562 }
562 563
563 } // namespace content 564 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698