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

Revert "Changed argument occurences of const I420VideoFrame* to const I420VideoFrame& and non-const I420VideoFrame& to I420VideoFrame*."

Browse Source 
This reverts commit r8731.

Reason for revert: Breakes Chromium FYI bots.

TBR=hbos, tommi

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

Cr-Commit-Position: refs/heads/master@{#8733}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8733 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
magjed@webrtc.org
2015-03-16 13:46:52 +00:00
parent 93d9d6503e
commit 2056ee3e3c
72 changed files with 290 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/video_coding/main/test/test_util.cc
View File

@ -113,7 +113,7 @@ FileOutputFrameReceiver::~FileOutputFrameReceiver() {
}
int32_t FileOutputFrameReceiver::FrameToRender(
webrtc::I420VideoFrame* video_frame) {
webrtc::I420VideoFrame& video_frame) {
if (timing_file_ == NULL) {
std::string basename;
std::string extension;
@ -123,14 +123,14 @@ int32_t FileOutputFrameReceiver::FrameToRender(
return -1;
}
}
if (out_file_ == NULL || video_frame->width() != width_ ||
video_frame->height() != height_) {
if (out_file_ == NULL || video_frame.width() != width_ ||
video_frame.height() != height_) {
if (out_file_) {
fclose(out_file_);
}
printf("New size: %dx%d\n", video_frame->width(), video_frame->height());
width_ = video_frame->width();
height_ = video_frame->height();
printf("New size: %dx%d\n", video_frame.width(), video_frame.height());
width_ = video_frame.width();
height_ = video_frame.height();
std::string filename_with_width_height = AppendWidthHeightCount(
out_filename_, width_, height_, count_);
++count_;
@ -139,9 +139,9 @@ int32_t FileOutputFrameReceiver::FrameToRender(
return -1;
}
}
fprintf(timing_file_, "%u, %u\n", video_frame->timestamp(),
webrtc::MaskWord64ToUWord32(video_frame->render_time_ms()));
if (PrintI420VideoFrame(*video_frame, out_file_) < 0) {
fprintf(timing_file_, "%u, %u\n", video_frame.timestamp(),
webrtc::MaskWord64ToUWord32(video_frame.render_time_ms()));
if (PrintI420VideoFrame(video_frame, out_file_) < 0) {
return -1;
}
return 0;