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

Side by Side Diff: content/renderer/media/media_stream_source_extra_data.h

Issue 14346002: Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 7 years, 8 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
OLDNEW
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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "content/common/media/media_stream_options.h" 10 #include "content/common/media/media_stream_options.h"
11 #include "content/renderer/media/media_stream_source_observer.h"
11 #include "media/base/audio_capturer_source.h" 12 #include "media/base/audio_capturer_source.h"
12 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h" 13 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h" 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 class CONTENT_EXPORT MediaStreamSourceExtraData 18 class CONTENT_EXPORT MediaStreamSourceExtraData
18 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) { 19 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) {
19 public: 20 public:
20 21 MediaStreamSourceExtraData(
21 explicit MediaStreamSourceExtraData( 22 const StreamDeviceInfo& device_info,
22 const StreamDeviceInfo& device_info); 23 const WebKit::WebMediaStreamSource& webkit_source);
23 explicit MediaStreamSourceExtraData( 24 explicit MediaStreamSourceExtraData(
24 media::AudioCapturerSource* source); 25 media::AudioCapturerSource* source);
25 virtual ~MediaStreamSourceExtraData(); 26 virtual ~MediaStreamSourceExtraData();
26 27
28 // Returns the WebMediaStreamSource object that owns this object.
29 const WebKit::WebMediaStreamSource& webkit_source() const {
30 return webkit_source_;
31 }
32
27 // Return device information about the camera or microphone. 33 // Return device information about the camera or microphone.
28 const StreamDeviceInfo& device_info() const { 34 const StreamDeviceInfo& device_info() const {
29 return device_info_; 35 return device_info_;
30 } 36 }
31 37
32 void SetVideoSource(webrtc::VideoSourceInterface* source) { 38 void SetVideoSource(webrtc::VideoSourceInterface* source) {
33 video_source_ = source; 39 video_source_ = source;
40 source_observer_.reset(new MediaStreamSourceObserver(source, this));
34 } 41 }
35 42
36 void SetLocalAudioSource(webrtc::AudioSourceInterface* source) { 43 void SetLocalAudioSource(webrtc::AudioSourceInterface* source) {
37 local_audio_source_ = source; 44 local_audio_source_ = source;
45 // TODO(perkj): Implement a local source observer for audio.
46 // See |source_observer_|.
38 } 47 }
39 48
40 webrtc::VideoSourceInterface* video_source() { return video_source_; } 49 webrtc::VideoSourceInterface* video_source() { return video_source_; }
41 media::AudioCapturerSource* audio_source() { return audio_source_; } 50 media::AudioCapturerSource* audio_source() { return audio_source_; }
42 webrtc::AudioSourceInterface* local_audio_source() { 51 webrtc::AudioSourceInterface* local_audio_source() {
43 return local_audio_source_; 52 return local_audio_source_;
44 } 53 }
45 54
46 private: 55 private:
47 StreamDeviceInfo device_info_; 56 StreamDeviceInfo device_info_;
57
58 // TODO(tommyw): Remove |webkit_source_| after WebMediaStreamSource::Owner()
59 // is implemented, which let us fetch the
60 // WebMediaStreamSource without increasing the reference count.
61 // |webkit_source_| will create a circular reference to WebMediaStreamSource.
62 // WebMediaStreamSource -> MediaStreamSourceExtraData -> WebMediaStreamSource
63 // Currently, we rely on manually releasing the MediaStreamSourceExtraData
64 // from WebMediaStreamSource like what
65 // MediaStreamImpl::~UserMediaRequestInfo() does.
66 WebKit::WebMediaStreamSource webkit_source_;
48 scoped_refptr<webrtc::VideoSourceInterface> video_source_; 67 scoped_refptr<webrtc::VideoSourceInterface> video_source_;
49 scoped_refptr<media::AudioCapturerSource> audio_source_; 68 scoped_refptr<media::AudioCapturerSource> audio_source_;
50 69
51 // This member holds an instance of webrtc::LocalAudioSource. This is used 70 // This member holds an instance of webrtc::LocalAudioSource. This is used
52 // as a container for audio options. 71 // as a container for audio options.
53 // TODO(hclam): This should be merged with |audio_source_| such that it 72 // TODO(hclam): This should be merged with |audio_source_| such that it
54 // carries audio options. 73 // carries audio options.
55 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_; 74 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;
75 scoped_ptr<MediaStreamSourceObserver> source_observer_;
56 76
57 DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData); 77 DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);
58 }; 78 };
59 79
60 } // namespace content 80 } // namespace content
61 81
62 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_ 82 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698