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

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

Issue 2021843002: Delete unused code in webrtc_libyuv.cc. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Copy Calc16ByteAlignedStride. Created 4 years, 6 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
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 #include <stdio.h> 11 #include <stdio.h>
12 12
13 #include <memory> 13 #include <memory>
14 14
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/base/timeutils.h" 17 #include "webrtc/base/timeutils.h"
18 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 18 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
19 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 19 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
20 #include "webrtc/test/testsupport/fileutils.h" 20 #include "webrtc/test/testsupport/fileutils.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 namespace {
25 void Calc16ByteAlignedStride(int width, int* stride_y, int* stride_uv) {
26 *stride_y = 16 * ((width + 15) / 16);
27 *stride_uv = 16 * ((width + 31) / 32);
28 }
29
30 } // Anonymous namespace
31
24 enum { kMaxWaitEncTimeMs = 100 }; 32 enum { kMaxWaitEncTimeMs = 100 };
25 enum { kMaxWaitDecTimeMs = 25 }; 33 enum { kMaxWaitDecTimeMs = 25 };
26 34
27 static const uint32_t kTestTimestamp = 123; 35 static const uint32_t kTestTimestamp = 123;
28 static const int64_t kTestNtpTimeMs = 456; 36 static const int64_t kTestNtpTimeMs = 456;
29 37
30 // TODO(mikhal): Replace these with mocks. 38 // TODO(mikhal): Replace these with mocks.
31 class Vp8UnitTestEncodeCompleteCallback : public webrtc::EncodedImageCallback { 39 class Vp8UnitTestEncodeCompleteCallback : public webrtc::EncodedImageCallback {
32 public: 40 public:
33 Vp8UnitTestEncodeCompleteCallback(EncodedImage* frame, 41 Vp8UnitTestEncodeCompleteCallback(EncodedImage* frame,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 ASSERT_TRUE(source_file_ != NULL); 133 ASSERT_TRUE(source_file_ != NULL);
126 // Set input frame. 134 // Set input frame.
127 ASSERT_EQ( 135 ASSERT_EQ(
128 fread(source_buffer_.get(), 1, length_source_frame_, source_file_), 136 fread(source_buffer_.get(), 1, length_source_frame_, source_file_),
129 length_source_frame_); 137 length_source_frame_);
130 codec_inst_.width = kWidth; 138 codec_inst_.width = kWidth;
131 codec_inst_.height = kHeight; 139 codec_inst_.height = kHeight;
132 const int kFramerate = 30; 140 const int kFramerate = 30;
133 codec_inst_.maxFramerate = kFramerate; 141 codec_inst_.maxFramerate = kFramerate;
134 // Setting aligned stride values. 142 // Setting aligned stride values.
135 int stride_uv = 0; 143 int stride_uv;
136 int stride_y = 0; 144 int stride_y;
137 Calc16ByteAlignedStride(codec_inst_.width, &stride_y, &stride_uv); 145 Calc16ByteAlignedStride(codec_inst_.width, &stride_y, &stride_uv);
138 EXPECT_EQ(stride_y, 176); 146 EXPECT_EQ(stride_y, 176);
139 EXPECT_EQ(stride_uv, 96); 147 EXPECT_EQ(stride_uv, 96);
140 148
141 input_frame_.CreateEmptyFrame(codec_inst_.width, codec_inst_.height, 149 input_frame_.CreateEmptyFrame(codec_inst_.width, codec_inst_.height,
142 stride_y, stride_uv, stride_uv); 150 stride_y, stride_uv, stride_uv);
143 input_frame_.set_timestamp(kTestTimestamp); 151 input_frame_.set_timestamp(kTestTimestamp);
144 // Using ConvertToI420 to add stride to the image. 152 // Using ConvertToI420 to add stride to the image.
145 EXPECT_EQ(0, ConvertToI420(kI420, source_buffer_.get(), 0, 0, 153 EXPECT_EQ(0, ConvertToI420(kI420, source_buffer_.get(), 0, 0,
146 codec_inst_.width, codec_inst_.height, 0, 154 codec_inst_.width, codec_inst_.height, 0,
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 EXPECT_EQ(WEBRTC_VIDEO_CODEC_ERROR, 269 EXPECT_EQ(WEBRTC_VIDEO_CODEC_ERROR,
262 decoder_->Decode(encoded_frame_, false, NULL)); 270 decoder_->Decode(encoded_frame_, false, NULL));
263 // Now setting a key frame. 271 // Now setting a key frame.
264 encoded_frame_._frameType = kVideoFrameKey; 272 encoded_frame_._frameType = kVideoFrameKey;
265 EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, 273 EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
266 decoder_->Decode(encoded_frame_, false, NULL)); 274 decoder_->Decode(encoded_frame_, false, NULL));
267 EXPECT_GT(I420PSNR(&input_frame_, &decoded_frame_), 36); 275 EXPECT_GT(I420PSNR(&input_frame_, &decoded_frame_), 36);
268 } 276 }
269 277
270 } // namespace webrtc 278 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698