Commit c94107fd authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Change html_media_element_capture.cc to operate over MediaStreamSource

... instead of WebMediaStreamSource.

Some trailing blink:: namespace declarations are also removed.

This is part of the effort to reduce the needless use of
public Blink APIs (wrappers) within renderer/modules.

BUG=704136
R=guidou@chromium.org

Change-Id: I2b175ec0ba57a8ccb452b55c2e412ecf7668fe88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218703
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773150}
parent e4e20b37
...@@ -102,24 +102,24 @@ void CreateHTMLAudioElementCapturer( ...@@ -102,24 +102,24 @@ void CreateHTMLAudioElementCapturer(
DCHECK(web_media_stream); DCHECK(web_media_stream);
DCHECK(web_media_player); DCHECK(web_media_player);
blink::WebMediaStreamSource web_media_stream_source; const String track_id = WTF::CreateCanonicalUUIDString();
const WebString track_id(WTF::CreateCanonicalUUIDString());
web_media_stream_source.Initialize(track_id, auto* media_stream_source = MakeGarbageCollected<MediaStreamSource>(
blink::WebMediaStreamSource::kTypeAudio, track_id, MediaStreamSource::StreamType::kTypeAudio, track_id,
track_id, false /* is_remote */); false /* is_remote */);
auto* media_stream_component = auto* media_stream_component =
MakeGarbageCollected<MediaStreamComponent>(web_media_stream_source); MakeGarbageCollected<MediaStreamComponent>(media_stream_source);
blink::MediaStreamAudioSource* const media_stream_source = MediaStreamAudioSource* const media_stream_audio_source =
HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl(
web_media_player, std::move(task_runner)); web_media_player, std::move(task_runner));
// Takes ownership of |media_stream_source|. // |media_stream_source| takes ownership of |media_stream_audio_source|.
web_media_stream_source.SetPlatformSource( media_stream_audio_source->SetOwner(media_stream_source);
base::WrapUnique(media_stream_source)); media_stream_source->SetPlatformSource(
base::WrapUnique(media_stream_audio_source));
blink::WebMediaStreamSource::Capabilities capabilities; WebMediaStreamSource::Capabilities capabilities;
capabilities.device_id = track_id; capabilities.device_id = track_id;
capabilities.echo_cancellation.emplace_back(false); capabilities.echo_cancellation.emplace_back(false);
capabilities.auto_gain_control.emplace_back(false); capabilities.auto_gain_control.emplace_back(false);
...@@ -128,9 +128,9 @@ void CreateHTMLAudioElementCapturer( ...@@ -128,9 +128,9 @@ void CreateHTMLAudioElementCapturer(
media::SampleFormatToBitsPerChannel(media::kSampleFormatS16), // min media::SampleFormatToBitsPerChannel(media::kSampleFormatS16), // min
media::SampleFormatToBitsPerChannel(media::kSampleFormatS16) // max media::SampleFormatToBitsPerChannel(media::kSampleFormatS16) // max
}; };
web_media_stream_source.SetCapabilities(capabilities); media_stream_source->SetCapabilities(capabilities);
media_stream_source->ConnectToTrack(media_stream_component); media_stream_audio_source->ConnectToTrack(media_stream_component);
web_media_stream->AddTrack(media_stream_component); web_media_stream->AddTrack(media_stream_component);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment