diff options
Diffstat (limited to 'content/renderer/media')
25 files changed, 122 insertions, 58 deletions
diff --git a/content/renderer/media/audio_hardware.cc b/content/renderer/media/audio_hardware.cc index f0ff736..3e863c6 100644 --- a/content/renderer/media/audio_hardware.cc +++ b/content/renderer/media/audio_hardware.cc @@ -8,6 +8,7 @@ #include "content/common/view_messages.h" #include "content/renderer/render_thread_impl.h" +using content::RenderThreadImpl; using media::ChannelLayout; using media::CHANNEL_LAYOUT_NONE; diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index 738581f..a6a3d8e 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -182,18 +182,18 @@ bool MediaStreamDependencyFactory::CreateNativeLocalMediaStream( video_track->set_enabled(video_components[i].isEnabled()); } - description->setExtraData(new MediaStreamExtraData(native_stream)); + description->setExtraData(new content::MediaStreamExtraData(native_stream)); return true; } bool MediaStreamDependencyFactory::CreateNativeLocalMediaStream( WebKit::WebMediaStreamDescriptor* description, - const MediaStreamExtraData::StreamStopCallback& stream_stop) { + const content::MediaStreamExtraData::StreamStopCallback& stream_stop) { if (!CreateNativeLocalMediaStream(description)) return false; - MediaStreamExtraData* extra_data = - static_cast<MediaStreamExtraData*>(description->extraData()); + content::MediaStreamExtraData* extra_data = + static_cast<content::MediaStreamExtraData*>(description->extraData()); extra_data->SetLocalStreamStopCallback(stream_stop); return true; } @@ -201,7 +201,7 @@ bool MediaStreamDependencyFactory::CreateNativeLocalMediaStream( bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { if (!pc_factory_.get()) { DCHECK(!audio_device_); - audio_device_ = new WebRtcAudioDeviceImpl(); + audio_device_ = new content::WebRtcAudioDeviceImpl(); scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( webrtc::CreatePeerConnectionFactory(worker_thread_, signaling_thread_, diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h index faa0086..1ab19dd 100644 --- a/content/renderer/media/media_stream_dependency_factory.h +++ b/content/renderer/media/media_stream_dependency_factory.h @@ -22,6 +22,7 @@ class WaitableEvent; namespace content { class IpcNetworkManager; class IpcPacketSocketFactory; +class WebRtcAudioDeviceImpl; } namespace talk_base { @@ -44,7 +45,6 @@ class WebRTCPeerConnectionHandlerClient; } class VideoCaptureImplManager; -class WebRtcAudioDeviceImpl; // Object factory for RTC MediaStreams and RTC PeerConnections. class CONTENT_EXPORT MediaStreamDependencyFactory @@ -76,7 +76,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory // stopped. bool CreateNativeLocalMediaStream( WebKit::WebMediaStreamDescriptor* description, - const MediaStreamExtraData::StreamStopCallback& stream_stop); + const content::MediaStreamExtraData::StreamStopCallback& stream_stop); // Asks the libjingle PeerConnection factory to create a libjingle // PeerConnection object. @@ -149,7 +149,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory scoped_refptr<VideoCaptureImplManager> vc_manager_; scoped_refptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_; - scoped_refptr<WebRtcAudioDeviceImpl> audio_device_; + scoped_refptr<content::WebRtcAudioDeviceImpl> audio_device_; // PeerConnection threads. signaling_thread_ is created from the // "current" chrome thread. diff --git a/content/renderer/media/media_stream_dependency_factory_unittest.cc b/content/renderer/media/media_stream_dependency_factory_unittest.cc index 5d0f7ba..3922beb 100644 --- a/content/renderer/media/media_stream_dependency_factory_unittest.cc +++ b/content/renderer/media/media_stream_dependency_factory_unittest.cc @@ -82,8 +82,8 @@ TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) { true); EXPECT_TRUE(dependency_factory_->CreateNativeLocalMediaStream(&stream_desc)); - MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>( - stream_desc.extraData()); + content::MediaStreamExtraData* extra_data = + static_cast<content::MediaStreamExtraData*>(stream_desc.extraData()); ASSERT_TRUE(extra_data && extra_data->local_stream()); EXPECT_EQ(1u, extra_data->local_stream()->audio_tracks()->count()); EXPECT_EQ(1u, extra_data->local_stream()->video_tracks()->count()); @@ -108,8 +108,8 @@ TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStreamWithoutSource) { stream_desc.initialize("new stream", audio_sources, video_sources); EXPECT_TRUE(dependency_factory_->CreateNativeLocalMediaStream(&stream_desc)); - MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>( - stream_desc.extraData()); + content::MediaStreamExtraData* extra_data = + static_cast<content::MediaStreamExtraData*>(stream_desc.extraData()); ASSERT_TRUE(extra_data && extra_data->local_stream()); EXPECT_EQ(0u, extra_data->local_stream()->video_tracks()->count()); EXPECT_EQ(0u, extra_data->local_stream()->audio_tracks()->count()); diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc index 060fa60..b9ef2a5 100644 --- a/content/renderer/media/media_stream_dispatcher.cc +++ b/content/renderer/media/media_stream_dispatcher.cc @@ -10,6 +10,8 @@ #include "content/renderer/render_view_impl.h" #include "googleurl/src/gurl.h" +namespace content { + struct MediaStreamDispatcher::Request { Request(const base::WeakPtr<MediaStreamDispatcherEventHandler>& handler, int request_id, @@ -59,7 +61,7 @@ struct MediaStreamDispatcher::EnumerationState::CachedDevices { }; MediaStreamDispatcher::MediaStreamDispatcher(RenderViewImpl* render_view) - : content::RenderViewObserver(render_view), + : RenderViewObserver(render_view), main_loop_(base::MessageLoopProxy::current()), next_ipc_id_(0) { } @@ -117,13 +119,13 @@ void MediaStreamDispatcher::EnumerateDevices( media_stream::MediaStreamType type, const GURL& security_origin) { DCHECK(main_loop_->BelongsToCurrentThread()); - DCHECK(type == content::MEDIA_DEVICE_AUDIO_CAPTURE || - type == content::MEDIA_DEVICE_VIDEO_CAPTURE); + DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE || + type == MEDIA_DEVICE_VIDEO_CAPTURE); DVLOG(1) << "MediaStreamDispatcher::EnumerateDevices(" << request_id << ")"; EnumerationState* state = - (type == content::MEDIA_DEVICE_AUDIO_CAPTURE ? + (type == MEDIA_DEVICE_AUDIO_CAPTURE ? &audio_enumeration_state_ : &video_enumeration_state_); state->requests.push_back(EnumerationRequest(event_handler, request_id)); @@ -328,9 +330,9 @@ void MediaStreamDispatcher::OnDeviceOpened( if (request.ipc_request == request_id) { Stream new_stream; new_stream.handler = request.handler; - if (content::IsAudioMediaType(device_info.stream_type)) { + if (IsAudioMediaType(device_info.stream_type)) { new_stream.audio_array.push_back(device_info); - } else if (content::IsVideoMediaType(device_info.stream_type)) { + } else if (IsVideoMediaType(device_info.stream_type)) { new_stream.video_array.push_back(device_info); } else { NOTREACHED(); @@ -388,3 +390,5 @@ int MediaStreamDispatcher::video_session_id(const std::string& label, DCHECK_GT(it->second.video_array.size(), static_cast<size_t>(index)); return it->second.video_array[index].session_id; } + +} // namespace content diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h index a5a4c07..877271a 100644 --- a/content/renderer/media/media_stream_dispatcher.h +++ b/content/renderer/media/media_stream_dispatcher.h @@ -22,6 +22,8 @@ namespace base { class MessageLoopProxy; } +namespace content { + class RenderViewImpl; // MediaStreamDispatcher is a delegate for the Media Stream API messages. @@ -30,7 +32,7 @@ class RenderViewImpl; // It's the complement of MediaStreamDispatcherHost (owned by // BrowserRenderProcessHost). class CONTENT_EXPORT MediaStreamDispatcher - : public content::RenderViewObserver, + : public RenderViewObserver, public base::SupportsWeakPtr<MediaStreamDispatcher> { public: explicit MediaStreamDispatcher(RenderViewImpl* render_view); @@ -161,4 +163,6 @@ class CONTENT_EXPORT MediaStreamDispatcher DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_ diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc index 342e918..1bf9853 100644 --- a/content/renderer/media/media_stream_dispatcher_unittest.cc +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc @@ -14,6 +14,7 @@ #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +namespace content { namespace { const int kRouteId = 0; @@ -25,12 +26,9 @@ const int kRequestId3 = 30; const int kRequestId4 = 40; static const char kLabel[] = "test"; -const content::MediaStreamDeviceType kAudioType = - content::MEDIA_DEVICE_AUDIO_CAPTURE; -const content::MediaStreamDeviceType kVideoType = - content::MEDIA_DEVICE_VIDEO_CAPTURE; -const content::MediaStreamDeviceType kNoAudioType = - content::MEDIA_NO_SERVICE; +const MediaStreamDeviceType kAudioType = MEDIA_DEVICE_AUDIO_CAPTURE; +const MediaStreamDeviceType kVideoType = MEDIA_DEVICE_VIDEO_CAPTURE; +const MediaStreamDeviceType kNoAudioType = MEDIA_NO_SERVICE; class MockMediaStreamDispatcherEventHandler : public MediaStreamDispatcherEventHandler, @@ -408,3 +406,5 @@ TEST(MediaStreamDispatcherTest, CancelGenerateStream) { EXPECT_EQ(handler->label_, stream_label1); EXPECT_EQ(0u, dispatcher->requests_.size()); } + +} // namespace content diff --git a/content/renderer/media/media_stream_extra_data.h b/content/renderer/media/media_stream_extra_data.h index a94e730..984e16c 100644 --- a/content/renderer/media/media_stream_extra_data.h +++ b/content/renderer/media/media_stream_extra_data.h @@ -16,6 +16,8 @@ class MediaStreamInterface; class LocalMediaStreamInterface; } // namespace webrtc +namespace content { + class CONTENT_EXPORT MediaStreamExtraData : NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) { public: @@ -43,4 +45,6 @@ class CONTENT_EXPORT MediaStreamExtraData DISALLOW_COPY_AND_ASSIGN(MediaStreamExtraData); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_ diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index d776d69..95ad1a5 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -31,6 +31,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" +namespace content { namespace { const int kVideoCaptureWidth = 640; @@ -50,21 +51,21 @@ std::string GetMandatoryStreamConstraint( void UpdateOptionsIfTabMediaRequest( const WebKit::WebUserMediaRequest& user_media_request, media_stream::StreamOptions* options) { - if (options->audio_type != content::MEDIA_NO_SERVICE && + if (options->audio_type != MEDIA_NO_SERVICE && GetMandatoryStreamConstraint(user_media_request.audioConstraints(), media_stream::kMediaStreamSource) == media_stream::kMediaStreamSourceTab) { - options->audio_type = content::MEDIA_TAB_AUDIO_CAPTURE; + options->audio_type = MEDIA_TAB_AUDIO_CAPTURE; options->audio_device_id = GetMandatoryStreamConstraint( user_media_request.audioConstraints(), media_stream::kMediaStreamSourceId); } - if (options->video_type != content::MEDIA_NO_SERVICE && + if (options->video_type != MEDIA_NO_SERVICE && GetMandatoryStreamConstraint(user_media_request.videoConstraints(), media_stream::kMediaStreamSource) == media_stream::kMediaStreamSourceTab) { - options->video_type = content::MEDIA_TAB_VIDEO_CAPTURE; + options->video_type = MEDIA_TAB_VIDEO_CAPTURE; options->video_device_id = GetMandatoryStreamConstraint( user_media_request.videoConstraints(), media_stream::kMediaStreamSourceId); @@ -96,11 +97,11 @@ static void CreateWebKitSourceVector( } MediaStreamImpl::MediaStreamImpl( - content::RenderView* render_view, + RenderView* render_view, MediaStreamDispatcher* media_stream_dispatcher, VideoCaptureImplManager* vc_manager, MediaStreamDependencyFactory* dependency_factory) - : content::RenderViewObserver(render_view), + : RenderViewObserver(render_view), dependency_factory_(dependency_factory), media_stream_dispatcher_(media_stream_dispatcher), vc_manager_(vc_manager) { @@ -126,8 +127,7 @@ void MediaStreamImpl::requestUserMedia( UpdateWebRTCMethodCount(WEBKIT_GET_USER_MEDIA); DCHECK(CalledOnValidThread()); int request_id = g_next_request_id++; - media_stream::StreamOptions options(content::MEDIA_NO_SERVICE, - content::MEDIA_NO_SERVICE); + media_stream::StreamOptions options(MEDIA_NO_SERVICE, MEDIA_NO_SERVICE); WebKit::WebFrame* frame = NULL; GURL security_origin; @@ -136,14 +136,14 @@ void MediaStreamImpl::requestUserMedia( if (user_media_request.isNull()) { // We are in a test. if (audio_sources.size() > 0) - options.audio_type = content::MEDIA_DEVICE_AUDIO_CAPTURE; + options.audio_type = MEDIA_DEVICE_AUDIO_CAPTURE; if (video_sources.size() > 0) - options.video_type = content::MEDIA_DEVICE_VIDEO_CAPTURE; + options.video_type = MEDIA_DEVICE_VIDEO_CAPTURE; } else { if (user_media_request.audio()) - options.audio_type = content::MEDIA_DEVICE_AUDIO_CAPTURE; + options.audio_type = MEDIA_DEVICE_AUDIO_CAPTURE; if (user_media_request.video()) - options.video_type = content::MEDIA_DEVICE_VIDEO_CAPTURE; + options.video_type = MEDIA_DEVICE_VIDEO_CAPTURE; security_origin = GURL(user_media_request.securityOrigin().toString()); // Get the WebFrame that requested a MediaStream. @@ -405,7 +405,7 @@ MediaStreamImpl::CreateLocalVideoFrameProvider( DVLOG(1) << "MediaStreamImpl::CreateLocalVideoFrameProvider video_session_id:" << video_session_id; - return new content::LocalVideoCapture( + return new LocalVideoCapture( video_session_id, vc_manager_.get(), capability, @@ -424,7 +424,7 @@ MediaStreamImpl::CreateRemoteVideoFrameProvider( DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoFrameProvider label:" << stream->label(); - return new content::RTCVideoRenderer( + return new RTCVideoRenderer( stream->video_tracks()->at(0), error_cb, repaint_cb); @@ -494,3 +494,5 @@ void MediaStreamExtraData::OnLocalStreamStop() { if (!stream_stop_callback_.is_null()) stream_stop_callback_.Run(local_stream_->label()); } + +} // namespace content diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h index 19493fe..e8db00d 100644 --- a/content/renderer/media/media_stream_impl.h +++ b/content/renderer/media/media_stream_impl.h @@ -26,10 +26,12 @@ namespace WebKit { class WebMediaStreamDescriptor; } -class MediaStreamDispatcher; class MediaStreamDependencyFactory; class VideoCaptureImplManager; +namespace content { +class MediaStreamDispatcher; + // MediaStreamImpl is a delegate for the Media Stream API messages used by // WebKit. It ties together WebKit, native PeerConnection in libjingle and // MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost) @@ -37,7 +39,7 @@ class VideoCaptureImplManager; // render thread. // MediaStreamImpl have weak pointers to a MediaStreamDispatcher. class CONTENT_EXPORT MediaStreamImpl - : public content::RenderViewObserver, + : public RenderViewObserver, NON_EXPORTED_BASE(public WebKit::WebUserMediaClient), NON_EXPORTED_BASE(public webkit_media::MediaStreamClient), public MediaStreamDispatcherEventHandler, @@ -45,7 +47,7 @@ class CONTENT_EXPORT MediaStreamImpl NON_EXPORTED_BASE(public base::NonThreadSafe) { public: MediaStreamImpl( - content::RenderView* render_view, + RenderView* render_view, MediaStreamDispatcher* media_stream_dispatcher, VideoCaptureImplManager* vc_manager, MediaStreamDependencyFactory* dependency_factory); @@ -93,7 +95,7 @@ class CONTENT_EXPORT MediaStreamImpl const media_stream::StreamDeviceInfo& device_info) OVERRIDE; virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; - // content::RenderViewObserver OVERRIDE + // RenderViewObserver OVERRIDE virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE; protected: @@ -161,4 +163,6 @@ class CONTENT_EXPORT MediaStreamImpl DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc index a280e8c..f80f2ed 100644 --- a/content/renderer/media/media_stream_impl_unittest.cc +++ b/content/renderer/media/media_stream_impl_unittest.cc @@ -19,6 +19,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" +namespace content { + class MediaStreamImplUnderTest : public MediaStreamImpl { public: MediaStreamImplUnderTest(MediaStreamDispatcher* media_stream_dispatcher, @@ -77,8 +79,8 @@ class MediaStreamImplTest : public ::testing::Test { ms_dispatcher_->video_array()); WebKit::WebMediaStreamDescriptor desc = ms_impl_->last_generated_stream(); - MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>( - desc.extraData()); + content::MediaStreamExtraData* extra_data = + static_cast<content::MediaStreamExtraData*>(desc.extraData()); if (!extra_data || !extra_data->local_stream()) { ADD_FAILURE(); return desc; @@ -137,3 +139,5 @@ TEST_F(MediaStreamImplTest, LocalMediaStream) { ms_impl_->FrameWillClose(NULL); EXPECT_EQ(3, ms_dispatcher_->stop_stream_counter()); } + +} // namespace content diff --git a/content/renderer/media/mock_media_stream_dispatcher.cc b/content/renderer/media/mock_media_stream_dispatcher.cc index 5eb18d1..017ad3a 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.cc +++ b/content/renderer/media/mock_media_stream_dispatcher.cc @@ -7,6 +7,8 @@ #include "base/stringprintf.h" #include "content/public/common/media_stream_request.h" +namespace content { + MockMediaStreamDispatcher::MockMediaStreamDispatcher() : MediaStreamDispatcher(NULL), request_id_(-1), @@ -26,7 +28,7 @@ void MockMediaStreamDispatcher::GenerateStream( audio_array_.clear(); video_array_.clear(); - if (content::IsAudioMediaType(components.audio_type)) { + if (IsAudioMediaType(components.audio_type)) { media_stream::StreamDeviceInfo audio; audio.device_id = "audio_device_id"; audio.name = "microphone"; @@ -34,7 +36,7 @@ void MockMediaStreamDispatcher::GenerateStream( audio.session_id = request_id; audio_array_.push_back(audio); } - if (content::IsVideoMediaType(components.video_type)) { + if (IsVideoMediaType(components.video_type)) { media_stream::StreamDeviceInfo video; video.device_id = "video_device_id"; video.name = "usb video camera"; @@ -61,3 +63,5 @@ int MockMediaStreamDispatcher::audio_session_id(const std::string& label, int index) { return -1; } + +} // namespace content diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h index 057311b..a51bcee 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.h +++ b/content/renderer/media/mock_media_stream_dispatcher.h @@ -10,6 +10,8 @@ #include "content/renderer/media/media_stream_dispatcher.h" #include "googleurl/src/gurl.h" +namespace content { + // This class is a mock implementation of MediaStreamDispatcher. class MockMediaStreamDispatcher : public MediaStreamDispatcher { public: @@ -48,4 +50,6 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher { DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcher); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DISPATCHER_H_ diff --git a/content/renderer/media/peer_connection_handler_base.cc b/content/renderer/media/peer_connection_handler_base.cc index aee660a..328e384 100644 --- a/content/renderer/media/peer_connection_handler_base.cc +++ b/content/renderer/media/peer_connection_handler_base.cc @@ -14,8 +14,8 @@ static webrtc::LocalMediaStreamInterface* GetLocalNativeMediaStream( const WebKit::WebMediaStreamDescriptor& stream) { - MediaStreamExtraData* extra_data = - static_cast<MediaStreamExtraData*>(stream.extraData()); + content::MediaStreamExtraData* extra_data = + static_cast<content::MediaStreamExtraData*>(stream.extraData()); if (extra_data) return extra_data->local_stream(); return NULL; @@ -91,6 +91,6 @@ PeerConnectionHandlerBase::CreateWebKitStreamDescriptor( WebKit::WebMediaStreamDescriptor descriptor; descriptor.initialize(UTF8ToUTF16(stream->label()), audio_source_vector, video_source_vector); - descriptor.setExtraData(new MediaStreamExtraData(stream)); + descriptor.setExtraData(new content::MediaStreamExtraData(stream)); return descriptor; } diff --git a/content/renderer/media/peer_connection_handler_jsep_unittest.cc b/content/renderer/media/peer_connection_handler_jsep_unittest.cc index cfd0f0d..a561916 100644 --- a/content/renderer/media/peer_connection_handler_jsep_unittest.cc +++ b/content/renderer/media/peer_connection_handler_jsep_unittest.cc @@ -88,7 +88,7 @@ class PeerConnectionHandlerJsepTest : public ::testing::Test { WebKit::WebMediaStreamDescriptor local_stream; local_stream.initialize(UTF8ToUTF16(stream_label), audio_sources, video_sources); - local_stream.setExtraData(new MediaStreamExtraData(native_stream)); + local_stream.setExtraData(new content::MediaStreamExtraData(native_stream)); return local_stream; } diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.cc b/content/renderer/media/pepper_platform_video_decoder_impl.cc index 3c5f234..ab444e8 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.cc +++ b/content/renderer/media/pepper_platform_video_decoder_impl.cc @@ -4,8 +4,6 @@ #include "content/renderer/media/pepper_platform_video_decoder_impl.h" -#include <vector> - #include "base/bind.h" #include "base/logging.h" #include "content/common/child_process.h" @@ -14,6 +12,8 @@ using media::BitstreamBuffer; +namespace content { + PlatformVideoDecoderImpl::PlatformVideoDecoderImpl( VideoDecodeAccelerator::Client* client, int32 command_buffer_route_id) @@ -35,7 +35,7 @@ bool PlatformVideoDecoderImpl::Initialize(media::VideoCodecProfile profile) { // it is okay to immediately send IPC messages through the returned channel. GpuChannelHost* channel = render_thread->EstablishGpuChannelSync( - content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); + CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); if (!channel) return false; @@ -126,3 +126,5 @@ void PlatformVideoDecoderImpl::NotifyResetDone() { DCHECK(RenderThreadImpl::current()); client_->NotifyResetDone(); } + +} // namespace content diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.h b/content/renderer/media/pepper_platform_video_decoder_impl.h index 0008531..3ca62c8 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.h +++ b/content/renderer/media/pepper_platform_video_decoder_impl.h @@ -13,6 +13,8 @@ #include "media/video/video_decode_accelerator.h" #include "webkit/plugins/ppapi/plugin_delegate.h" +namespace content { + class PlatformVideoDecoderImpl : public webkit::ppapi::PluginDelegate::PlatformVideoDecoder, public media::VideoDecodeAccelerator::Client { @@ -62,4 +64,7 @@ class PlatformVideoDecoderImpl DISALLOW_COPY_AND_ASSIGN(PlatformVideoDecoderImpl); }; + +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_PEPPER_PLATFORM_VIDEO_DECODER_IMPL_H_ diff --git a/content/renderer/media/render_audiosourceprovider.cc b/content/renderer/media/render_audiosourceprovider.cc index 335cae2..c8a7fce 100644 --- a/content/renderer/media/render_audiosourceprovider.cc +++ b/content/renderer/media/render_audiosourceprovider.cc @@ -16,11 +16,11 @@ #include "media/base/audio_renderer_mixer_input.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h" -using content::AudioDeviceFactory; -using content::AudioRendererMixerManager; using std::vector; using WebKit::WebVector; +namespace content { + RenderAudioSourceProvider::RenderAudioSourceProvider() : is_initialized_(false), channels_(0), @@ -149,3 +149,5 @@ void RenderAudioSourceProvider::Initialize( } RenderAudioSourceProvider::~RenderAudioSourceProvider() {} + +} // namespace content diff --git a/content/renderer/media/render_audiosourceprovider.h b/content/renderer/media/render_audiosourceprovider.h index 8dc5788..b264c0e4 100644 --- a/content/renderer/media/render_audiosourceprovider.h +++ b/content/renderer/media/render_audiosourceprovider.h @@ -31,6 +31,8 @@ namespace WebKit { class WebAudioSourceProviderClient; } +namespace content { + class RenderAudioSourceProvider : public WebKit::WebAudioSourceProvider, public media::AudioRendererSink { @@ -80,4 +82,6 @@ class RenderAudioSourceProvider DISALLOW_COPY_AND_ASSIGN(RenderAudioSourceProvider); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_RENDER_AUDIOSOURCEPROVIDER_H_ diff --git a/content/renderer/media/render_media_log.cc b/content/renderer/media/render_media_log.cc index 2081078..23ea4eef 100644 --- a/content/renderer/media/render_media_log.cc +++ b/content/renderer/media/render_media_log.cc @@ -9,6 +9,8 @@ #include "content/common/view_messages.h" #include "content/renderer/render_thread_impl.h" +namespace content { + RenderMediaLog::RenderMediaLog() : render_loop_(base::MessageLoopProxy::current()) { DCHECK(RenderThreadImpl::current()) << @@ -26,3 +28,5 @@ void RenderMediaLog::AddEvent(scoped_ptr<media::MediaLogEvent> event) { } RenderMediaLog::~RenderMediaLog() {} + +} // namespace content diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h index 96fd0e8..4c26cdf 100644 --- a/content/renderer/media/render_media_log.h +++ b/content/renderer/media/render_media_log.h @@ -11,6 +11,8 @@ namespace base { class MessageLoopProxy; } +namespace content { + // RenderMediaLog is an implementation of MediaLog that passes all events to the // browser process. class RenderMediaLog : public media::MediaLog { @@ -28,4 +30,6 @@ class RenderMediaLog : public media::MediaLog { DISALLOW_COPY_AND_ASSIGN(RenderMediaLog); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_RENDER_MEDIA_LOG_H_ diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index b65a0d6..4889f5e 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc @@ -92,7 +92,7 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test { WebKit::WebMediaStreamDescriptor local_stream; local_stream.initialize(UTF8ToUTF16(stream_label), audio_sources, video_sources); - local_stream.setExtraData(new MediaStreamExtraData(native_stream)); + local_stream.setExtraData(new content::MediaStreamExtraData(native_stream)); return local_stream; } diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc index 9fea501..36ecab4 100644 --- a/content/renderer/media/webrtc_audio_device_impl.cc +++ b/content/renderer/media/webrtc_audio_device_impl.cc @@ -15,10 +15,11 @@ #include "media/audio/audio_util.h" #include "media/audio/sample_rates.h" -using content::AudioDeviceFactory; using media::AudioParameters; using media::ChannelLayout; +namespace content { + static const int64 kMillisecondsBetweenProcessCalls = 5000; static const double kMaxVolumeLevel = 255.0; @@ -1164,3 +1165,5 @@ int32_t WebRtcAudioDeviceImpl::GetLoudspeakerStatus(bool* enabled) const { void WebRtcAudioDeviceImpl::SetSessionId(int session_id) { session_id_ = session_id; } + +} // namespace content diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index a63acd7..35bda15 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h @@ -201,6 +201,9 @@ // (WebRTC client a media layer). This approach ensures that we can avoid // transferring maximum levels between the renderer and the browser. // + +namespace content { + class CONTENT_EXPORT WebRtcAudioDeviceImpl : NON_EXPORTED_BASE(public webrtc::AudioDeviceModule), NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback), @@ -448,4 +451,6 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl DISALLOW_COPY_AND_ASSIGN(WebRtcAudioDeviceImpl); }; +} // namespace content + #endif // CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_ diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc index 3235385..ec6337a 100644 --- a/content/renderer/media/webrtc_audio_device_unittest.cc +++ b/content/renderer/media/webrtc_audio_device_unittest.cc @@ -22,6 +22,8 @@ using testing::InvokeWithoutArgs; using testing::Return; using testing::StrEq; +namespace content { + namespace { class AudioUtil : public AudioUtilInterface { @@ -518,3 +520,5 @@ TEST_F(WebRTCAudioDeviceTest, FullDuplexAudioWithAGC) { EXPECT_EQ(0, base->DeleteChannel(ch)); EXPECT_EQ(0, base->Terminate()); } + +} // namespace content |