| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "public/platform/WebMediaStreamSource.h" | 31 #include "public/platform/WebMediaStreamSource.h" |
| 32 | 32 |
| 33 #include "platform/audio/AudioBus.h" | 33 #include "platform/audio/AudioBus.h" |
| 34 #include "platform/mediastream/MediaStreamSource.h" | 34 #include "platform/mediastream/MediaStreamSource.h" |
| 35 #include "public/platform/WebAudioDestinationConsumer.h" | 35 #include "public/platform/WebAudioDestinationConsumer.h" |
| 36 #include "public/platform/WebMediaConstraints.h" | 36 #include "public/platform/WebMediaConstraints.h" |
| 37 #include "public/platform/WebString.h" | 37 #include "public/platform/WebString.h" |
| 38 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PtrUtil.h" |
| 39 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
| 40 #include <memory> |
| 40 | 41 |
| 41 namespace blink { | 42 namespace blink { |
| 42 | 43 |
| 43 namespace { | 44 namespace { |
| 44 | 45 |
| 45 class ExtraDataContainer : public MediaStreamSource::ExtraData { | 46 class ExtraDataContainer : public MediaStreamSource::ExtraData { |
| 46 public: | 47 public: |
| 47 ExtraDataContainer(PassOwnPtr<WebMediaStreamSource::ExtraData> extraData) :
m_extraData(std::move(extraData)) { } | 48 ExtraDataContainer(std::unique_ptr<WebMediaStreamSource::ExtraData> extraDat
a) : m_extraData(std::move(extraData)) { } |
| 48 | 49 |
| 49 WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get();
} | 50 WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get();
} |
| 50 | 51 |
| 51 private: | 52 private: |
| 52 OwnPtr<WebMediaStreamSource::ExtraData> m_extraData; | 53 std::unique_ptr<WebMediaStreamSource::ExtraData> m_extraData; |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 } // namespace | 56 } // namespace |
| 56 | 57 |
| 57 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() | 58 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() |
| 58 { | 59 { |
| 59 ASSERT(m_owner); | 60 ASSERT(m_owner); |
| 60 return WebMediaStreamSource(m_owner); | 61 return WebMediaStreamSource(m_owner); |
| 61 } | 62 } |
| 62 | 63 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 return static_cast<ExtraDataContainer*>(data)->getExtraData(); | 148 return static_cast<ExtraDataContainer*>(data)->getExtraData(); |
| 148 } | 149 } |
| 149 | 150 |
| 150 void WebMediaStreamSource::setExtraData(ExtraData* extraData) | 151 void WebMediaStreamSource::setExtraData(ExtraData* extraData) |
| 151 { | 152 { |
| 152 ASSERT(!m_private.isNull()); | 153 ASSERT(!m_private.isNull()); |
| 153 | 154 |
| 154 if (extraData) | 155 if (extraData) |
| 155 extraData->setOwner(m_private.get()); | 156 extraData->setOwner(m_private.get()); |
| 156 | 157 |
| 157 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))
)); | 158 m_private->setExtraData(wrapUnique(new ExtraDataContainer(wrapUnique(extraDa
ta)))); |
| 158 } | 159 } |
| 159 | 160 |
| 160 WebMediaConstraints WebMediaStreamSource::constraints() | 161 WebMediaConstraints WebMediaStreamSource::constraints() |
| 161 { | 162 { |
| 162 ASSERT(!m_private.isNull()); | 163 ASSERT(!m_private.isNull()); |
| 163 return m_private->constraints(); | 164 return m_private->constraints(); |
| 164 } | 165 } |
| 165 | 166 |
| 166 bool WebMediaStreamSource::requiresAudioConsumer() const | 167 bool WebMediaStreamSource::requiresAudioConsumer() const |
| 167 { | 168 { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get()); | 226 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get()); |
| 226 if (wrapper->consumer() == consumer) { | 227 if (wrapper->consumer() == consumer) { |
| 227 m_private->removeAudioConsumer(wrapper); | 228 m_private->removeAudioConsumer(wrapper); |
| 228 return true; | 229 return true; |
| 229 } | 230 } |
| 230 } | 231 } |
| 231 return false; | 232 return false; |
| 232 } | 233 } |
| 233 | 234 |
| 234 } // namespace blink | 235 } // namespace blink |
| OLD | NEW |