| Index: content/renderer/media/pepper_to_video_track_adapter.cc
|
| diff --git a/content/renderer/media/pepper_to_video_track_adapter.cc b/content/renderer/media/pepper_to_video_track_adapter.cc
|
| index c8d892c30095de1f39deebb967803f9147124559..104bd010da5748c17d44dba91bd325fdf7706d7c 100644
|
| --- a/content/renderer/media/pepper_to_video_track_adapter.cc
|
| +++ b/content/renderer/media/pepper_to_video_track_adapter.cc
|
| @@ -121,7 +121,7 @@ void PpFrameWriter::GetCurrentSupportedFormats(
|
| int max_requested_height,
|
| double max_requested_frame_rate,
|
| const VideoCaptureDeviceFormatsCB& callback) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DVLOG(3) << "PpFrameWriter::GetCurrentSupportedFormats()";
|
| // Since the input is free to change the resolution at any point in time
|
| // the supported formats are unknown.
|
| @@ -133,7 +133,7 @@ void PpFrameWriter::StartSourceImpl(
|
| const media::VideoCaptureFormat& format,
|
| const blink::WebMediaConstraints& constraints,
|
| const VideoCaptureDeliverFrameCB& frame_callback) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(!delegate_.get());
|
| DVLOG(3) << "PpFrameWriter::StartSourceImpl()";
|
| delegate_ = new FrameWriterDelegate(io_task_runner(), frame_callback);
|
| @@ -141,14 +141,14 @@ void PpFrameWriter::StartSourceImpl(
|
| }
|
|
|
| void PpFrameWriter::StopSourceImpl() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| }
|
|
|
| // Note: PutFrame must copy or process image_data directly in this function,
|
| // because it may be overwritten as soon as we return from this function.
|
| void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data,
|
| int64_t time_stamp_ns) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| TRACE_EVENT0("video", "PpFrameWriter::PutFrame");
|
| DVLOG(3) << "PpFrameWriter::PutFrame()";
|
|
|
|
|