| Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
|
| index c80ccbb73a553540bde2c3b4edbde902a8486c6a..36646a987715cfc36580c09a8ddb5efd33e25e89 100644
|
| --- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
|
| @@ -47,9 +47,9 @@ struct FrameDecodeParams {
|
| // instead once the pipeline supports it.
|
| rtc::scoped_refptr<webrtc::VideoFrameBuffer> VideoFrameBufferForPixelBuffer(
|
| CVPixelBufferRef pixel_buffer) {
|
| - DCHECK(pixel_buffer);
|
| - DCHECK(CVPixelBufferGetPixelFormatType(pixel_buffer) ==
|
| - kCVPixelFormatType_420YpCbCr8BiPlanarFullRange);
|
| + RTC_DCHECK(pixel_buffer);
|
| + RTC_DCHECK(CVPixelBufferGetPixelFormatType(pixel_buffer) ==
|
| + kCVPixelFormatType_420YpCbCr8BiPlanarFullRange);
|
| size_t width = CVPixelBufferGetWidthOfPlane(pixel_buffer, 0);
|
| size_t height = CVPixelBufferGetHeightOfPlane(pixel_buffer, 0);
|
| // TODO(tkchin): Use a frame buffer pool.
|
| @@ -125,7 +125,7 @@ int H264VideoToolboxDecoder::Decode(
|
| const RTPFragmentationHeader* fragmentation,
|
| const CodecSpecificInfo* codec_specific_info,
|
| int64_t render_time_ms) {
|
| - DCHECK(input_image._buffer);
|
| + RTC_DCHECK(input_image._buffer);
|
|
|
| CMSampleBufferRef sample_buffer = nullptr;
|
| if (!H264AnnexBBufferToCMSampleBuffer(input_image._buffer,
|
| @@ -134,7 +134,7 @@ int H264VideoToolboxDecoder::Decode(
|
| &sample_buffer)) {
|
| return WEBRTC_VIDEO_CODEC_ERROR;
|
| }
|
| - DCHECK(sample_buffer);
|
| + RTC_DCHECK(sample_buffer);
|
| // Check if the video format has changed, and reinitialize decoder if needed.
|
| CMVideoFormatDescriptionRef description =
|
| CMSampleBufferGetFormatDescription(sample_buffer);
|
| @@ -160,7 +160,7 @@ int H264VideoToolboxDecoder::Decode(
|
|
|
| int H264VideoToolboxDecoder::RegisterDecodeCompleteCallback(
|
| DecodedImageCallback* callback) {
|
| - DCHECK(!callback_);
|
| + RTC_DCHECK(!callback_);
|
| callback_ = callback;
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
| @@ -238,7 +238,7 @@ int H264VideoToolboxDecoder::ResetDecompressionSession() {
|
| }
|
|
|
| void H264VideoToolboxDecoder::ConfigureDecompressionSession() {
|
| - DCHECK(decompression_session_);
|
| + RTC_DCHECK(decompression_session_);
|
| #if defined(WEBRTC_IOS)
|
| VTSessionSetProperty(decompression_session_,
|
| kVTDecompressionPropertyKey_RealTime, kCFBooleanTrue);
|
|
|