Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Side by Side Diff: content/renderer/media/media_stream_video_track.cc

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: LOG in video_Frame and CHECK/return outside. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_video_track.h" 5 #include "content/renderer/media/media_stream_video_track.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 black_frame_ = 170 black_frame_ =
171 media::VideoFrame::CreateBlackFrame(reference_frame->natural_size()); 171 media::VideoFrame::CreateBlackFrame(reference_frame->natural_size());
172 } 172 }
173 173
174 // Wrap |black_frame_| so we get a fresh timestamp we can modify. Frames 174 // Wrap |black_frame_| so we get a fresh timestamp we can modify. Frames
175 // returned from this function may still be in use. 175 // returned from this function may still be in use.
176 scoped_refptr<media::VideoFrame> wrapped_black_frame = 176 scoped_refptr<media::VideoFrame> wrapped_black_frame =
177 media::VideoFrame::WrapVideoFrame( 177 media::VideoFrame::WrapVideoFrame(
178 black_frame_, black_frame_->visible_rect(), 178 black_frame_, black_frame_->visible_rect(),
179 black_frame_->natural_size()); 179 black_frame_->natural_size());
180 if (!wrapped_black_frame)
181 return nullptr;
180 wrapped_black_frame->AddDestructionObserver( 182 wrapped_black_frame->AddDestructionObserver(
181 base::Bind(&ReleaseOriginalFrame, black_frame_)); 183 base::Bind(&ReleaseOriginalFrame, black_frame_));
182 184
183 wrapped_black_frame->set_timestamp(reference_frame->timestamp()); 185 wrapped_black_frame->set_timestamp(reference_frame->timestamp());
184 base::TimeTicks reference_time; 186 base::TimeTicks reference_time;
185 if (reference_frame->metadata()->GetTimeTicks( 187 if (reference_frame->metadata()->GetTimeTicks(
186 media::VideoFrameMetadata::REFERENCE_TIME, &reference_time)) { 188 media::VideoFrameMetadata::REFERENCE_TIME, &reference_time)) {
187 wrapped_black_frame->metadata()->SetTimeTicks( 189 wrapped_black_frame->metadata()->SetTimeTicks(
188 media::VideoFrameMetadata::REFERENCE_TIME, reference_time); 190 media::VideoFrameMetadata::REFERENCE_TIME, reference_time);
189 } 191 }
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 } 274 }
273 275
274 void MediaStreamVideoTrack::OnReadyStateChanged( 276 void MediaStreamVideoTrack::OnReadyStateChanged(
275 blink::WebMediaStreamSource::ReadyState state) { 277 blink::WebMediaStreamSource::ReadyState state) {
276 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 278 DCHECK(main_render_thread_checker_.CalledOnValidThread());
277 for (auto* sink : sinks_) 279 for (auto* sink : sinks_)
278 sink->OnReadyStateChanged(state); 280 sink->OnReadyStateChanged(state);
279 } 281 }
280 282
281 } // namespace content 283 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698