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

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

Issue 1514143003: Add support for unmixed audio from remote WebRTC remote tracks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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_track.h" 5 #include "content/renderer/media/media_stream_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/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 // static 13 // static
14 MediaStreamTrack* MediaStreamTrack::GetTrack( 14 MediaStreamTrack* MediaStreamTrack::GetTrack(
15 const blink::WebMediaStreamTrack& track) { 15 const blink::WebMediaStreamTrack& track) {
16 if (track.isNull()) 16 if (track.isNull())
17 return NULL; 17 return NULL;
18 return static_cast<MediaStreamTrack*>(track.extraData()); 18 return static_cast<MediaStreamTrack*>(track.extraData());
19 } 19 }
20 20
21 MediaStreamTrack::MediaStreamTrack(bool is_local_track) 21 MediaStreamTrack::MediaStreamTrack(bool is_local_track)
22 : is_local_track_(is_local_track) { 22 : is_local_track_(is_local_track) {
23 } 23 }
24 24
25 MediaStreamTrack::~MediaStreamTrack() { 25 MediaStreamTrack::~MediaStreamTrack() {
26 } 26 }
27 27
28 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() { 28 MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track)
29 : MediaStreamTrack(is_local_track) {
30 }
31
32 MediaStreamAudioTrack::~MediaStreamAudioTrack() {
33 }
34
35 // static
36 MediaStreamAudioTrack* MediaStreamAudioTrack::GetTrack(
37 const blink::WebMediaStreamTrack& track) {
38 if (track.isNull() ||
39 track.source().type() != blink::WebMediaStreamSource::TypeAudio) {
40 return nullptr;
41 }
42 return static_cast<MediaStreamAudioTrack*>(track.extraData());
43 }
44
45 webrtc::AudioTrackInterface* MediaStreamAudioTrack::GetAudioAdapter() {
29 NOTREACHED(); 46 NOTREACHED();
30 return nullptr; 47 return nullptr;
31 } 48 }
32 49
33 } // namespace content 50 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698