zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I420VideoFrame: Remove functions set_width, set_height, and ResetSize

Browse Source 
The functions set_width, set_height, and ResetSize in I420VideoFrame are not needed and just add complexity.

R=perkj@webrtc.org, stefan@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/39939004

Cr-Commit-Position: refs/heads/master@{#8434}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8434 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
magjed@webrtc.org
2015-02-19 15:34:55 +00:00
parent be96bfb179
commit be29b3b4c6
13 changed files with 20 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc
View File

@ -91,8 +91,6 @@ TEST_F(VideoProcessingModuleTest, HandleNullBuffer) {
VideoProcessingModule::FrameStats stats;
// Video frame with unallocated buffer.
I420VideoFrame videoFrame;
videoFrame.set_width(width_);
videoFrame.set_height(height_);
EXPECT_EQ(-3, vpm_->GetFrameStats(&stats, videoFrame));
@ -120,21 +118,21 @@ TEST_F(VideoProcessingModuleTest, HandleBadStats) {
TEST_F(VideoProcessingModuleTest, HandleBadSize) {
VideoProcessingModule::FrameStats stats;
video_frame_.ResetSize();
video_frame_.set_width(width_);
video_frame_.set_height(0);
EXPECT_EQ(-3, vpm_->GetFrameStats(&stats, video_frame_));
I420VideoFrame bad_frame;
bad_frame.CreateEmptyFrame(width_, 0, width_, (width_ + 1) / 2,
(width_ + 1) / 2);
EXPECT_EQ(-3, vpm_->GetFrameStats(&stats, bad_frame));
EXPECT_EQ(-1, vpm_->ColorEnhancement(&video_frame_));
EXPECT_EQ(-1, vpm_->ColorEnhancement(&bad_frame));
EXPECT_EQ(-1, vpm_->Deflickering(&video_frame_, &stats));
EXPECT_EQ(-1, vpm_->Deflickering(&bad_frame, &stats));
EXPECT_EQ(-3, vpm_->BrightnessDetection(video_frame_, stats));
EXPECT_EQ(-3, vpm_->BrightnessDetection(bad_frame, stats));
EXPECT_EQ(VPM_PARAMETER_ERROR, vpm_->SetTargetResolution(0,0,0));
I420VideoFrame *out_frame = NULL;
EXPECT_EQ(VPM_PARAMETER_ERROR, vpm_->PreprocessFrame(video_frame_,
EXPECT_EQ(VPM_PARAMETER_ERROR, vpm_->PreprocessFrame(bad_frame,
&out_frame));
}
@ -335,8 +333,10 @@ void CropFrame(const uint8_t* source_data,
int cropped_width,
int cropped_height,
I420VideoFrame* cropped_frame) {
cropped_frame->set_width(cropped_width);
cropped_frame->set_height(cropped_height);
cropped_frame->CreateEmptyFrame(cropped_width, cropped_height,
cropped_width,
(cropped_width + 1) / 2,
(cropped_width + 1) / 2);
EXPECT_EQ(0,
ConvertToI420(kI420, source_data, offset_x, offset_y, source_width,
source_height, 0, kRotateNone, cropped_frame));