| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/public/renderer/media_stream_utils.h" | 5 #include "content/public/renderer/media_stream_utils.h" | 
| 6 | 6 | 
| 7 #include <memory> | 7 #include <memory> | 
| 8 #include <utility> | 8 #include <utility> | 
| 9 | 9 | 
| 10 #include "base/callback.h" | 10 #include "base/callback.h" | 
| 11 #include "base/guid.h" | 11 #include "base/guid.h" | 
| 12 #include "base/rand_util.h" | 12 #include "base/rand_util.h" | 
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" | 
| 14 #include "content/renderer/media/external_media_stream_audio_source.h" | 14 #include "content/renderer/media/external_media_stream_audio_source.h" | 
| 15 #include "content/renderer/media/media_stream_video_capturer_source.h" | 15 #include "content/renderer/media/media_stream_video_capturer_source.h" | 
| 16 #include "content/renderer/media/media_stream_video_source.h" | 16 #include "content/renderer/media/media_stream_video_source.h" | 
| 17 #include "content/renderer/media/media_stream_video_track.h" | 17 #include "content/renderer/media/media_stream_video_track.h" | 
| 18 #include "media/base/audio_capturer_source.h" | 18 #include "media/base/audio_capturer_source.h" | 
| 19 #include "media/capture/video_capturer_source.h" | 19 #include "media/capture/video_capturer_source.h" | 
| 20 #include "third_party/WebKit/public/platform/WebMediaStream.h" | 20 #include "third_party/WebKit/public/platform/WebMediaStream.h" | 
| 21 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 21 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 
| 22 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 22 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 
| 23 | 23 | 
| 24 namespace content { | 24 namespace content { | 
| 25 | 25 | 
| 26 bool AddVideoTrackToMediaStream( | 26 bool AddVideoTrackToMediaStream( | 
| 27     std::unique_ptr<media::VideoCapturerSource> video_source, | 27     std::unique_ptr<media::VideoCapturerSource> video_source, | 
| 28     bool is_remote, |  | 
| 29     bool is_readonly, |  | 
| 30     blink::WebMediaStream* web_media_stream) { | 28     blink::WebMediaStream* web_media_stream) { | 
| 31   DCHECK(video_source.get()); | 29   DCHECK(video_source.get()); | 
| 32   if (!web_media_stream || web_media_stream->isNull()) { | 30   if (!web_media_stream || web_media_stream->isNull()) { | 
| 33     DLOG(ERROR) << "WebMediaStream is null"; | 31     DLOG(ERROR) << "WebMediaStream is null"; | 
| 34     return false; | 32     return false; | 
| 35   } | 33   } | 
| 36 | 34 | 
| 37   blink::WebMediaStreamSource web_media_stream_source; | 35   blink::WebMediaStreamSource web_media_stream_source; | 
| 38   MediaStreamVideoSource* const media_stream_source = | 36   MediaStreamVideoSource* const media_stream_source = | 
| 39       new MediaStreamVideoCapturerSource( | 37       new MediaStreamVideoCapturerSource( | 
| 40           MediaStreamSource::SourceStoppedCallback(), std::move(video_source)); | 38           MediaStreamSource::SourceStoppedCallback(), std::move(video_source)); | 
| 41   const blink::WebString track_id = | 39   const blink::WebString track_id = | 
| 42       blink::WebString::fromUTF8(base::GenerateGUID()); | 40       blink::WebString::fromUTF8(base::GenerateGUID()); | 
| 43   web_media_stream_source.initialize(track_id, | 41   web_media_stream_source.initialize( | 
| 44                                      blink::WebMediaStreamSource::TypeVideo, | 42       track_id, blink::WebMediaStreamSource::TypeVideo, track_id); | 
| 45                                      track_id, is_remote); |  | 
| 46   // Takes ownership of |media_stream_source|. | 43   // Takes ownership of |media_stream_source|. | 
| 47   web_media_stream_source.setExtraData(media_stream_source); | 44   web_media_stream_source.setExtraData(media_stream_source); | 
| 48 | 45 | 
| 49   blink::WebMediaConstraints constraints; | 46   blink::WebMediaConstraints constraints; | 
| 50   constraints.initialize(); | 47   constraints.initialize(); | 
| 51   web_media_stream->addTrack(MediaStreamVideoTrack::CreateVideoTrack( | 48   web_media_stream->addTrack(MediaStreamVideoTrack::CreateVideoTrack( | 
| 52       media_stream_source, constraints, | 49       media_stream_source, constraints, | 
| 53       MediaStreamVideoSource::ConstraintsCallback(), true)); | 50       MediaStreamVideoSource::ConstraintsCallback(), true)); | 
| 54   return true; | 51   return true; | 
| 55 } | 52 } | 
| 56 | 53 | 
| 57 bool AddAudioTrackToMediaStream( | 54 bool AddAudioTrackToMediaStream( | 
| 58     scoped_refptr<media::AudioCapturerSource> audio_source, | 55     scoped_refptr<media::AudioCapturerSource> audio_source, | 
| 59     int sample_rate, | 56     int sample_rate, | 
| 60     media::ChannelLayout channel_layout, | 57     media::ChannelLayout channel_layout, | 
| 61     int frames_per_buffer, | 58     int frames_per_buffer, | 
| 62     bool is_remote, |  | 
| 63     bool is_readonly, |  | 
| 64     blink::WebMediaStream* web_media_stream) { | 59     blink::WebMediaStream* web_media_stream) { | 
| 65   DCHECK(audio_source.get()); | 60   DCHECK(audio_source.get()); | 
| 66   if (!web_media_stream || web_media_stream->isNull()) { | 61   if (!web_media_stream || web_media_stream->isNull()) { | 
| 67     DLOG(ERROR) << "WebMediaStream is null"; | 62     DLOG(ERROR) << "WebMediaStream is null"; | 
| 68     return false; | 63     return false; | 
| 69   } | 64   } | 
| 70 | 65 | 
| 71   const media::AudioParameters params( | 66   const media::AudioParameters params( | 
| 72       media::AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, | 67       media::AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, | 
| 73       sample_rate, sizeof(int16_t) * 8, frames_per_buffer); | 68       sample_rate, sizeof(int16_t) * 8, frames_per_buffer); | 
| 74   if (!params.IsValid()) { | 69   if (!params.IsValid()) { | 
| 75     DLOG(ERROR) << "Invalid audio parameters."; | 70     DLOG(ERROR) << "Invalid audio parameters."; | 
| 76     return false; | 71     return false; | 
| 77   } | 72   } | 
| 78 | 73 | 
| 79   blink::WebMediaStreamSource web_media_stream_source; | 74   blink::WebMediaStreamSource web_media_stream_source; | 
| 80   const blink::WebString track_id = | 75   const blink::WebString track_id = | 
| 81       blink::WebString::fromUTF8(base::GenerateGUID()); | 76       blink::WebString::fromUTF8(base::GenerateGUID()); | 
| 82   web_media_stream_source.initialize(track_id, | 77   web_media_stream_source.initialize( | 
| 83                                      blink::WebMediaStreamSource::TypeAudio, | 78       track_id, blink::WebMediaStreamSource::TypeAudio, track_id); | 
| 84                                      track_id, is_remote); |  | 
| 85   MediaStreamAudioSource* const media_stream_source = | 79   MediaStreamAudioSource* const media_stream_source = | 
| 86       new ExternalMediaStreamAudioSource(std::move(audio_source), sample_rate, | 80       new ExternalMediaStreamAudioSource(std::move(audio_source), sample_rate, | 
| 87                                          channel_layout, frames_per_buffer, | 81                                          channel_layout, frames_per_buffer); | 
| 88                                          is_remote); |  | 
| 89   // Takes ownership of |media_stream_source|. | 82   // Takes ownership of |media_stream_source|. | 
| 90   web_media_stream_source.setExtraData(media_stream_source); | 83   web_media_stream_source.setExtraData(media_stream_source); | 
| 91 | 84 | 
| 92   blink::WebMediaStreamTrack web_media_stream_track; | 85   blink::WebMediaStreamTrack web_media_stream_track; | 
| 93   web_media_stream_track.initialize(web_media_stream_source); | 86   web_media_stream_track.initialize(web_media_stream_source); | 
| 94   if (!media_stream_source->ConnectToTrack(web_media_stream_track)) | 87   if (!media_stream_source->ConnectToTrack(web_media_stream_track)) | 
| 95     return false; | 88     return false; | 
| 96   web_media_stream->addTrack(web_media_stream_track); | 89   web_media_stream->addTrack(web_media_stream_track); | 
| 97   return true; | 90   return true; | 
| 98 } | 91 } | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 114     const blink::WebMediaStreamTrack& video_track) { | 107     const blink::WebMediaStreamTrack& video_track) { | 
| 115   if (video_track.isNull()) | 108   if (video_track.isNull()) | 
| 116     return; | 109     return; | 
| 117   MediaStreamVideoSource* const source = | 110   MediaStreamVideoSource* const source = | 
| 118       MediaStreamVideoSource::GetVideoSource(video_track.source()); | 111       MediaStreamVideoSource::GetVideoSource(video_track.source()); | 
| 119   if (source) | 112   if (source) | 
| 120     source->RequestRefreshFrame(); | 113     source->RequestRefreshFrame(); | 
| 121 } | 114 } | 
| 122 | 115 | 
| 123 }  // namespace content | 116 }  // namespace content | 
| OLD | NEW | 
|---|