| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 const WebVector<WebMediaStreamTrack>& audioTracks, | 62 const WebVector<WebMediaStreamTrack>& audioTracks, |
| 63 const WebVector<WebMediaStreamTrack>& videoTracks); | 63 const WebVector<WebMediaStreamTrack>& videoTracks); |
| 64 | 64 |
| 65 BLINK_PLATFORM_EXPORT void reset(); | 65 BLINK_PLATFORM_EXPORT void reset(); |
| 66 bool isNull() const { return m_private.isNull(); } | 66 bool isNull() const { return m_private.isNull(); } |
| 67 | 67 |
| 68 BLINK_PLATFORM_EXPORT WebString id() const; | 68 BLINK_PLATFORM_EXPORT WebString id() const; |
| 69 | 69 |
| 70 BLINK_PLATFORM_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) const; | 70 BLINK_PLATFORM_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) const; |
| 71 BLINK_PLATFORM_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) const; | 71 BLINK_PLATFORM_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) const; |
| 72 // If a track is not found with the specified id, the returned track's |
| 73 // |isNull| will return true. |
| 74 BLINK_PLATFORM_EXPORT WebMediaStreamTrack |
| 75 getAudioTrack(const WebString& trackId) const; |
| 76 BLINK_PLATFORM_EXPORT WebMediaStreamTrack |
| 77 getVideoTrack(const WebString& trackId) const; |
| 72 | 78 |
| 73 BLINK_PLATFORM_EXPORT void addTrack(const WebMediaStreamTrack&); | 79 BLINK_PLATFORM_EXPORT void addTrack(const WebMediaStreamTrack&); |
| 74 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&); | 80 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&); |
| 75 | 81 |
| 76 // Extra data associated with this WebMediaStream. | 82 // Extra data associated with this WebMediaStream. |
| 77 // If non-null, the extra data pointer will be deleted when the object is | 83 // If non-null, the extra data pointer will be deleted when the object is |
| 78 // destroyed. Setting the extra data pointer will cause any existing non-null | 84 // destroyed. Setting the extra data pointer will cause any existing non-null |
| 79 // extra data pointer to be deleted. | 85 // extra data pointer to be deleted. |
| 80 BLINK_PLATFORM_EXPORT ExtraData* getExtraData() const; | 86 BLINK_PLATFORM_EXPORT ExtraData* getExtraData() const; |
| 81 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); | 87 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); |
| 82 | 88 |
| 83 #if INSIDE_BLINK | 89 #if INSIDE_BLINK |
| 84 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*); | 90 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*); |
| 85 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const; | 91 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const; |
| 86 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*); | 92 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*); |
| 87 #endif | 93 #endif |
| 88 | 94 |
| 89 private: | 95 private: |
| 90 WebPrivatePtr<MediaStreamDescriptor> m_private; | 96 WebPrivatePtr<MediaStreamDescriptor> m_private; |
| 91 }; | 97 }; |
| 92 | 98 |
| 93 } // namespace blink | 99 } // namespace blink |
| 94 | 100 |
| 95 #endif // WebMediaStream_h | 101 #endif // WebMediaStream_h |
| OLD | NEW |