Index: content/renderer/pepper/pepper_video_encoder_host.cc |
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc |
index 0e1a19995b2eb0211e5a2abece04c06bc080521b..9e856a40f04d5cfef25cdadcc01d446c2b1557ce 100644 |
--- a/content/renderer/pepper/pepper_video_encoder_host.cc |
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc |
@@ -632,9 +632,15 @@ scoped_refptr<media::VideoFrame> PepperVideoEncoderHost::CreateVideoFrame( |
input_coded_size_, static_cast<uint8*>(buffer->video.data), |
buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset, |
base::TimeDelta()); |
- frame->AddDestructionObserver( |
- base::Bind(&PepperVideoEncoderHost::FrameReleased, |
- weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id)); |
+ if (frame) { |
+ frame->AddDestructionObserver( |
+ base::Bind(&PepperVideoEncoderHost::FrameReleased, |
+ weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id)); |
+ } else { |
Pawel Osciak
2015/11/26 01:19:03
Personally I'd prefer a clear error path, but up t
emircan
2015/12/04 04:20:09
Done.
|
+ DLOG(ERROR) << "Couldn't create video frame"; |
+ NotifyPepperError(PP_ERROR_FAILED); |
+ } |
+ |
return frame; |
} |