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

Unified Diff: content/renderer/media/mock_media_stream_registry.cc

Issue 1407083006: Update MediaRecorderHandler to use AudioTrackRecorder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mcasas@'s comments Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/mock_media_stream_registry.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/mock_media_stream_registry.cc
diff --git a/content/renderer/media/mock_media_stream_registry.cc b/content/renderer/media/mock_media_stream_registry.cc
index fdd0c7cc3fa2ae7ba69e29ab64eaac32c796682e..946b0d5b66e96cb59b113b00043a7a885c5a0412 100644
--- a/content/renderer/media/mock_media_stream_registry.cc
+++ b/content/renderer/media/mock_media_stream_registry.cc
@@ -8,8 +8,12 @@
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/media_stream.h"
+#include "content/renderer/media/media_stream_audio_source.h"
#include "content/renderer/media/media_stream_video_track.h"
+#include "content/renderer/media/mock_media_constraint_factory.h"
#include "content/renderer/media/mock_media_stream_video_source.h"
+#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
+#include "content/renderer/media/webrtc_local_audio_track.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -37,22 +41,47 @@ void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
"mock video source name",
false /* remote */, true /* readonly */);
MockMediaStreamVideoSource* native_source =
- new MockMediaStreamVideoSource(false);
+ new MockMediaStreamVideoSource(false /* manual get supported formats */);
blink_source.setExtraData(native_source);
blink::WebMediaStreamTrack blink_track;
blink_track.initialize(base::UTF8ToUTF16(track_id), blink_source);
blink::WebMediaConstraints constraints;
constraints.initialize();
- MediaStreamVideoTrack* native_track =
- new MediaStreamVideoTrack(native_source,
- constraints,
- MediaStreamVideoSource::ConstraintsCallback(),
- true);
+ MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
+ native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(),
+ true /* enabled */);
blink_track.setExtraData(native_track);
test_stream_.addTrack(blink_track);
}
+void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) {
+ blink::WebMediaStreamSource audio_source;
+ audio_source.initialize(
+ "mock audio source id", blink::WebMediaStreamSource::TypeAudio,
+ "mock audio source name", false /* remote */, true /* readonly */);
+ audio_source.setExtraData(new MediaStreamAudioSource());
+ blink::WebMediaStreamTrack blink_track;
+ blink_track.initialize(audio_source);
+ const StreamDeviceInfo device_info(
+ MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device", "mock_audio_device_id");
+ const MockMediaConstraintFactory constraint_factory;
+ const blink::WebMediaConstraints constraints =
+ constraint_factory.CreateWebMediaConstraints();
+ const scoped_refptr<WebRtcAudioCapturer> capturer(
+ WebRtcAudioCapturer::CreateCapturer(-1, /* render frame id */
+ device_info, constraints,
+ nullptr, /* audio device */
+ nullptr /* audio source */));
+ const scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
+ WebRtcLocalAudioTrackAdapter::Create(track_id,
+ nullptr /* track source */));
+ scoped_ptr<WebRtcLocalAudioTrack> native_track(new WebRtcLocalAudioTrack(
+ adapter.get(), capturer, nullptr /* webaudio source */));
+ blink_track.setExtraData(native_track.release());
+ test_stream_.addTrack(blink_track);
+}
+
blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
const std::string& url) {
return (url != stream_url_) ? blink::WebMediaStream() : test_stream_;
« no previous file with comments | « content/renderer/media/mock_media_stream_registry.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698