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

Side by Side Diff: content/renderer/media/media_stream_audio_track.cc

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer/media/media_stream_audio_track.h" 5 #include "content/renderer/media/media_stream_audio_track.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 9 #include "third_party/webrtc/api/mediastreaminterface.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track) 13 MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track)
14 : MediaStreamTrack(is_local_track) { 14 : MediaStreamTrack(is_local_track) {
15 } 15 }
16 16
17 MediaStreamAudioTrack::~MediaStreamAudioTrack() { 17 MediaStreamAudioTrack::~MediaStreamAudioTrack() {
18 } 18 }
19 19
20 // static 20 // static
21 MediaStreamAudioTrack* MediaStreamAudioTrack::GetTrack( 21 MediaStreamAudioTrack* MediaStreamAudioTrack::GetTrack(
22 const blink::WebMediaStreamTrack& track) { 22 const blink::WebMediaStreamTrack& track) {
23 if (track.isNull() || 23 if (track.isNull() ||
24 track.source().type() != blink::WebMediaStreamSource::TypeAudio) { 24 track.source().type() != blink::WebMediaStreamSource::TypeAudio) {
25 return nullptr; 25 return nullptr;
26 } 26 }
27 return static_cast<MediaStreamAudioTrack*>(track.extraData()); 27 return static_cast<MediaStreamAudioTrack*>(track.extraData());
28 } 28 }
29 29
30 webrtc::AudioTrackInterface* MediaStreamAudioTrack::GetAudioAdapter() { 30 webrtc::AudioTrackInterface* MediaStreamAudioTrack::GetAudioAdapter() {
31 NOTREACHED(); 31 NOTREACHED();
32 return nullptr; 32 return nullptr;
33 } 33 }
34 34
35 } // namespace content 35 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_source.h ('k') | content/renderer/media/media_stream_renderer_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698