| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 WebMediaStream::ExtraData* WebMediaStream::getExtraData() const { | 66 WebMediaStream::ExtraData* WebMediaStream::getExtraData() const { |
| 67 MediaStreamDescriptor::ExtraData* data = m_private->getExtraData(); | 67 MediaStreamDescriptor::ExtraData* data = m_private->getExtraData(); |
| 68 if (!data) | 68 if (!data) |
| 69 return 0; | 69 return 0; |
| 70 return static_cast<ExtraDataContainer*>(data)->getExtraData(); | 70 return static_cast<ExtraDataContainer*>(data)->getExtraData(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 void WebMediaStream::setExtraData(ExtraData* extraData) { | 73 void WebMediaStream::setExtraData(ExtraData* extraData) { |
| 74 m_private->setExtraData( | 74 m_private->setExtraData( |
| 75 wrapUnique(new ExtraDataContainer(wrapUnique(extraData)))); | 75 WTF::wrapUnique(new ExtraDataContainer(WTF::wrapUnique(extraData)))); |
| 76 } | 76 } |
| 77 | 77 |
| 78 void WebMediaStream::audioTracks( | 78 void WebMediaStream::audioTracks( |
| 79 WebVector<WebMediaStreamTrack>& webTracks) const { | 79 WebVector<WebMediaStreamTrack>& webTracks) const { |
| 80 size_t numberOfTracks = m_private->numberOfAudioComponents(); | 80 size_t numberOfTracks = m_private->numberOfAudioComponents(); |
| 81 WebVector<WebMediaStreamTrack> result(numberOfTracks); | 81 WebVector<WebMediaStreamTrack> result(numberOfTracks); |
| 82 for (size_t i = 0; i < numberOfTracks; ++i) | 82 for (size_t i = 0; i < numberOfTracks; ++i) |
| 83 result[i] = m_private->audioComponent(i); | 83 result[i] = m_private->audioComponent(i); |
| 84 webTracks.swap(result); | 84 webTracks.swap(result); |
| 85 } | 85 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 video.append(component); | 133 video.append(component); |
| 134 } | 134 } |
| 135 m_private = MediaStreamDescriptor::create(label, audio, video); | 135 m_private = MediaStreamDescriptor::create(label, audio, video); |
| 136 } | 136 } |
| 137 | 137 |
| 138 void WebMediaStream::assign(const WebMediaStream& other) { | 138 void WebMediaStream::assign(const WebMediaStream& other) { |
| 139 m_private = other.m_private; | 139 m_private = other.m_private; |
| 140 } | 140 } |
| 141 | 141 |
| 142 } // namespace blink | 142 } // namespace blink |
| OLD | NEW |