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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months 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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 input_image.height() != codec_.height)) { 718 input_image.height() != codec_.height)) {
719 int ret = UpdateCodecFrameSize(input_image); 719 int ret = UpdateCodecFrameSize(input_image);
720 if (ret < 0) 720 if (ret < 0)
721 return ret; 721 return ret;
722 } 722 }
723 723
724 // Since we are extracting raw pointers from |input_image| to 724 // Since we are extracting raw pointers from |input_image| to
725 // |raw_images_[0]|, the resolution of these frames must match. Note that 725 // |raw_images_[0]|, the resolution of these frames must match. Note that
726 // |input_image| might be scaled from |frame|. In that case, the resolution of 726 // |input_image| might be scaled from |frame|. In that case, the resolution of
727 // |raw_images_[0]| should have been updated in UpdateCodecFrameSize. 727 // |raw_images_[0]| should have been updated in UpdateCodecFrameSize.
728 DCHECK_EQ(input_image.width(), static_cast<int>(raw_images_[0].d_w)); 728 RTC_DCHECK_EQ(input_image.width(), static_cast<int>(raw_images_[0].d_w));
729 DCHECK_EQ(input_image.height(), static_cast<int>(raw_images_[0].d_h)); 729 RTC_DCHECK_EQ(input_image.height(), static_cast<int>(raw_images_[0].d_h));
730 730
731 // Image in vpx_image_t format. 731 // Image in vpx_image_t format.
732 // Input image is const. VP8's raw image is not defined as const. 732 // Input image is const. VP8's raw image is not defined as const.
733 raw_images_[0].planes[VPX_PLANE_Y] = 733 raw_images_[0].planes[VPX_PLANE_Y] =
734 const_cast<uint8_t*>(input_image.buffer(kYPlane)); 734 const_cast<uint8_t*>(input_image.buffer(kYPlane));
735 raw_images_[0].planes[VPX_PLANE_U] = 735 raw_images_[0].planes[VPX_PLANE_U] =
736 const_cast<uint8_t*>(input_image.buffer(kUPlane)); 736 const_cast<uint8_t*>(input_image.buffer(kUPlane));
737 raw_images_[0].planes[VPX_PLANE_V] = 737 raw_images_[0].planes[VPX_PLANE_V] =
738 const_cast<uint8_t*>(input_image.buffer(kVPlane)); 738 const_cast<uint8_t*>(input_image.buffer(kVPlane));
739 739
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 return -1; 1393 return -1;
1394 } 1394 }
1395 if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) 1395 if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_)
1396 != VPX_CODEC_OK) { 1396 != VPX_CODEC_OK) {
1397 return -1; 1397 return -1;
1398 } 1398 }
1399 return 0; 1399 return 0;
1400 } 1400 }
1401 1401
1402 } // namespace webrtc 1402 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698