| OLD | NEW |
| 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" | |
| 8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | |
| 9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" | |
| 10 | |
| 11 namespace content { | 7 namespace content { |
| 12 | 8 |
| 13 // static | 9 // static |
| 14 MediaStreamTrack* MediaStreamTrack::GetTrack( | 10 MediaStreamTrack* MediaStreamTrack::GetTrack( |
| 15 const blink::WebMediaStreamTrack& track) { | 11 const blink::WebMediaStreamTrack& track) { |
| 16 if (track.isNull()) | 12 return track.isNull() ? |
| 17 return NULL; | 13 nullptr : static_cast<MediaStreamTrack*>(track.extraData()); |
| 18 return static_cast<MediaStreamTrack*>(track.extraData()); | |
| 19 } | 14 } |
| 20 | 15 |
| 21 MediaStreamTrack::MediaStreamTrack(bool is_local_track) | 16 MediaStreamTrack::MediaStreamTrack(bool is_local_track) |
| 22 : is_local_track_(is_local_track) { | 17 : is_local_track_(is_local_track) { |
| 23 } | 18 } |
| 24 | 19 |
| 25 MediaStreamTrack::~MediaStreamTrack() { | 20 MediaStreamTrack::~MediaStreamTrack() { |
| 26 } | 21 } |
| 27 | 22 |
| 28 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() { | |
| 29 NOTREACHED(); | |
| 30 return nullptr; | |
| 31 } | |
| 32 | |
| 33 } // namespace content | 23 } // namespace content |
| OLD | NEW |