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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 initialize(createCanonicalUUIDString(), audioTracks, videoTracks); | 119 initialize(createCanonicalUUIDString(), audioTracks, videoTracks); |
120 } | 120 } |
121 | 121 |
122 void WebMediaStream::initialize( | 122 void WebMediaStream::initialize( |
123 const WebString& label, | 123 const WebString& label, |
124 const WebVector<WebMediaStreamTrack>& audioTracks, | 124 const WebVector<WebMediaStreamTrack>& audioTracks, |
125 const WebVector<WebMediaStreamTrack>& videoTracks) { | 125 const WebVector<WebMediaStreamTrack>& videoTracks) { |
126 MediaStreamComponentVector audio, video; | 126 MediaStreamComponentVector audio, video; |
127 for (size_t i = 0; i < audioTracks.size(); ++i) { | 127 for (size_t i = 0; i < audioTracks.size(); ++i) { |
128 MediaStreamComponent* component = audioTracks[i]; | 128 MediaStreamComponent* component = audioTracks[i]; |
129 audio.append(component); | 129 audio.push_back(component); |
130 } | 130 } |
131 for (size_t i = 0; i < videoTracks.size(); ++i) { | 131 for (size_t i = 0; i < videoTracks.size(); ++i) { |
132 MediaStreamComponent* component = videoTracks[i]; | 132 MediaStreamComponent* component = videoTracks[i]; |
133 video.append(component); | 133 video.push_back(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 |