| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 for (size_t i = 0; i < number_of_tracks; ++i) { | 114 for (size_t i = 0; i < number_of_tracks; ++i) { |
| 115 MediaStreamComponent* video_component = private_->VideoComponent(i); | 115 MediaStreamComponent* video_component = private_->VideoComponent(i); |
| 116 DCHECK(video_component); | 116 DCHECK(video_component); |
| 117 if (video_component->Id() == id) | 117 if (video_component->Id() == id) |
| 118 return private_->VideoComponent(i); | 118 return private_->VideoComponent(i); |
| 119 } | 119 } |
| 120 return nullptr; | 120 return nullptr; |
| 121 } | 121 } |
| 122 | 122 |
| 123 void WebMediaStream::AddTrack(const WebMediaStreamTrack& track) { | 123 void WebMediaStream::AddTrack(const WebMediaStreamTrack& track) { |
| 124 ASSERT(!IsNull()); | 124 DCHECK(!IsNull()); |
| 125 private_->AddRemoteTrack(track); | 125 private_->AddRemoteTrack(track); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void WebMediaStream::RemoveTrack(const WebMediaStreamTrack& track) { | 128 void WebMediaStream::RemoveTrack(const WebMediaStreamTrack& track) { |
| 129 ASSERT(!IsNull()); | 129 DCHECK(!IsNull()); |
| 130 private_->RemoveRemoteTrack(track); | 130 private_->RemoveRemoteTrack(track); |
| 131 } | 131 } |
| 132 | 132 |
| 133 WebMediaStream& WebMediaStream::operator=( | 133 WebMediaStream& WebMediaStream::operator=( |
| 134 MediaStreamDescriptor* media_stream_descriptor) { | 134 MediaStreamDescriptor* media_stream_descriptor) { |
| 135 private_ = media_stream_descriptor; | 135 private_ = media_stream_descriptor; |
| 136 return *this; | 136 return *this; |
| 137 } | 137 } |
| 138 | 138 |
| 139 WebMediaStream::operator MediaStreamDescriptor*() const { | 139 WebMediaStream::operator MediaStreamDescriptor*() const { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 160 video.push_back(component); | 160 video.push_back(component); |
| 161 } | 161 } |
| 162 private_ = MediaStreamDescriptor::Create(label, audio, video); | 162 private_ = MediaStreamDescriptor::Create(label, audio, video); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void WebMediaStream::Assign(const WebMediaStream& other) { | 165 void WebMediaStream::Assign(const WebMediaStream& other) { |
| 166 private_ = other.private_; | 166 private_ = other.private_; |
| 167 } | 167 } |
| 168 | 168 |
| 169 } // namespace blink | 169 } // namespace blink |
| OLD | NEW |