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

Remove I420VideoFrame::CloneFrame

Browse Source 
This function is not needed anymore.

BUG=1128
R=stefan@webrtc.org, tommi@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8843}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8843 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
magjed@webrtc.org
2015-03-24 12:37:36 +00:00
parent 0b52cebd28
commit 2d2a30c2e2
4 changed files with 23 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/common_video/i420_video_frame.cc
View File

@ -159,17 +159,6 @@ void I420VideoFrame::ShallowCopy(const I420VideoFrame& videoFrame) {
rotation_ = videoFrame.rotation_; rotation_ = videoFrame.rotation_;
} }
I420VideoFrame* I420VideoFrame::CloneFrame() const {
rtc::scoped_ptr<I420VideoFrame> new_frame(new I420VideoFrame());
if (new_frame->CopyFrame(*this) == -1) {
// TODO(pbos): Make void, not war.
// CopyFrame failed this shouldn't happen.
RTC_NOTREACHED();
return NULL;
}
return new_frame.release();
}
void I420VideoFrame::SwapFrame(I420VideoFrame* videoFrame) { void I420VideoFrame::SwapFrame(I420VideoFrame* videoFrame) {
video_frame_buffer_.swap(videoFrame->video_frame_buffer_); video_frame_buffer_.swap(videoFrame->video_frame_buffer_);
std::swap(timestamp_, videoFrame->timestamp_); std::swap(timestamp_, videoFrame->timestamp_);

30
webrtc/common_video/i420_video_frame_unittest.cc
View File

@ -199,28 +199,6 @@ TEST(TestI420VideoFrame, Reset) {
EXPECT_TRUE(frame.video_frame_buffer() == NULL); EXPECT_TRUE(frame.video_frame_buffer() == NULL);
} }
TEST(TestI420VideoFrame, CloneFrame) {
I420VideoFrame frame1;
rtc::scoped_ptr<I420VideoFrame> frame2;
const int kSizeY = 400;
const int kSizeU = 100;
const int kSizeV = 100;
uint8_t buffer_y[kSizeY];
uint8_t buffer_u[kSizeU];
uint8_t buffer_v[kSizeV];
memset(buffer_y, 16, kSizeY);
memset(buffer_u, 8, kSizeU);
memset(buffer_v, 4, kSizeV);
frame1.CreateFrame(buffer_y, buffer_u, buffer_v, 20, 20, 20, 10, 10);
frame1.set_timestamp(1);
frame1.set_ntp_time_ms(2);
frame1.set_render_time_ms(3);
frame2.reset(frame1.CloneFrame());
EXPECT_TRUE(frame2.get() != NULL);
EXPECT_TRUE(EqualFrames(frame1, *frame2));
}
TEST(TestI420VideoFrame, CopyBuffer) { TEST(TestI420VideoFrame, CopyBuffer) {
I420VideoFrame frame1, frame2; I420VideoFrame frame1, frame2;
int width = 15; int width = 15;
@ -365,14 +343,6 @@ TEST(TestI420VideoFrame, RefCount) {
EXPECT_EQ(0, handle.ref_count()); EXPECT_EQ(0, handle.ref_count());
} }
TEST(TestI420VideoFrame, CloneTextureFrame) {
NativeHandleImpl handle;
I420VideoFrame frame1(&handle, 640, 480, 100, 200);
rtc::scoped_ptr<I420VideoFrame> frame2(frame1.CloneFrame());
EXPECT_TRUE(frame2.get() != NULL);
EXPECT_TRUE(EqualTextureFrames(frame1, *frame2));
}
bool EqualPlane(const uint8_t* data1, bool EqualPlane(const uint8_t* data1,
const uint8_t* data2, const uint8_t* data2,
int stride, int stride,

53
webrtc/video/video_send_stream_tests.cc
View File

@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <algorithm> // max #include <algorithm> // max
#include <vector>
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
@ -24,7 +25,6 @@
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/ref_count.h"
#include "webrtc/system_wrappers/interface/scoped_vector.h"
#include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/logging.h"
@ -46,9 +46,9 @@ void ExpectEqualTextureFrames(const I420VideoFrame& frame1,
const I420VideoFrame& frame2); const I420VideoFrame& frame2);
void ExpectEqualBufferFrames(const I420VideoFrame& frame1, void ExpectEqualBufferFrames(const I420VideoFrame& frame1,
const I420VideoFrame& frame2); const I420VideoFrame& frame2);
void ExpectEqualFramesVector(const std::vector<I420VideoFrame*>& frames1, void ExpectEqualFramesVector(const std::vector<I420VideoFrame>& frames1,
const std::vector<I420VideoFrame*>& frames2); const std::vector<I420VideoFrame>& frames2);
I420VideoFrame* CreateI420VideoFrame(int width, int height, uint8_t data); I420VideoFrame CreateI420VideoFrame(int width, int height, uint8_t data);
class FakeNativeHandle : public NativeHandle { class FakeNativeHandle : public NativeHandle {
public: public:
@ -1031,8 +1031,7 @@ TEST_F(VideoSendStreamTest, CapturesTextureAndI420VideoFrames) {
FrameObserver() : output_frame_event_(EventWrapper::Create()) {} FrameObserver() : output_frame_event_(EventWrapper::Create()) {}
void FrameCallback(I420VideoFrame* video_frame) override { void FrameCallback(I420VideoFrame* video_frame) override {
// Clone the frame because the caller owns it. output_frames_.push_back(*video_frame);
output_frames_.push_back(video_frame->CloneFrame());
output_frame_event_->Set(); output_frame_event_->Set();
} }
@ -1042,13 +1041,13 @@ TEST_F(VideoSendStreamTest, CapturesTextureAndI420VideoFrames) {
<< "Timeout while waiting for output frames."; << "Timeout while waiting for output frames.";
} }
const std::vector<I420VideoFrame*>& output_frames() const { const std::vector<I420VideoFrame>& output_frames() const {
return output_frames_.get(); return output_frames_;
} }
private: private:
// Delivered output frames. // Delivered output frames.
ScopedVector<I420VideoFrame> output_frames_; std::vector<I420VideoFrame> output_frames_;
// Indicate an output frame has arrived. // Indicate an output frame has arrived.
rtc::scoped_ptr<EventWrapper> output_frame_event_; rtc::scoped_ptr<EventWrapper> output_frame_event_;
@ -1065,7 +1064,7 @@ TEST_F(VideoSendStreamTest, CapturesTextureAndI420VideoFrames) {
// Prepare five input frames. Send ordinary I420VideoFrame and texture frames // Prepare five input frames. Send ordinary I420VideoFrame and texture frames
// alternatively. // alternatively.
ScopedVector<I420VideoFrame> input_frames; std::vector<I420VideoFrame> input_frames;
int width = static_cast<int>(encoder_config_.streams[0].width); int width = static_cast<int>(encoder_config_.streams[0].width);
int height = static_cast<int>(encoder_config_.streams[0].height); int height = static_cast<int>(encoder_config_.streams[0].height);
webrtc::RefCountImpl<FakeNativeHandle>* handle1 = webrtc::RefCountImpl<FakeNativeHandle>* handle1 =
@ -1074,15 +1073,15 @@ TEST_F(VideoSendStreamTest, CapturesTextureAndI420VideoFrames) {
new webrtc::RefCountImpl<FakeNativeHandle>(); new webrtc::RefCountImpl<FakeNativeHandle>();
webrtc::RefCountImpl<FakeNativeHandle>* handle3 = webrtc::RefCountImpl<FakeNativeHandle>* handle3 =
new webrtc::RefCountImpl<FakeNativeHandle>(); new webrtc::RefCountImpl<FakeNativeHandle>();
input_frames.push_back(new I420VideoFrame(handle1, width, height, 1, 1)); input_frames.push_back(I420VideoFrame(handle1, width, height, 1, 1));
input_frames.push_back(new I420VideoFrame(handle2, width, height, 2, 2)); input_frames.push_back(I420VideoFrame(handle2, width, height, 2, 2));
input_frames.push_back(CreateI420VideoFrame(width, height, 3)); input_frames.push_back(CreateI420VideoFrame(width, height, 3));
input_frames.push_back(CreateI420VideoFrame(width, height, 4)); input_frames.push_back(CreateI420VideoFrame(width, height, 4));
input_frames.push_back(new I420VideoFrame(handle3, width, height, 5, 5)); input_frames.push_back(I420VideoFrame(handle3, width, height, 5, 5));
send_stream_->Start(); send_stream_->Start();
for (size_t i = 0; i < input_frames.size(); i++) { for (size_t i = 0; i < input_frames.size(); i++) {
send_stream_->Input()->IncomingCapturedFrame(*input_frames[i]); send_stream_->Input()->IncomingCapturedFrame(input_frames[i]);
// Do not send the next frame too fast, so the frame dropper won't drop it. // Do not send the next frame too fast, so the frame dropper won't drop it.
if (i < input_frames.size() - 1) if (i < input_frames.size() - 1)
SleepMs(1000 / encoder_config_.streams[0].max_framerate); SleepMs(1000 / encoder_config_.streams[0].max_framerate);
@ -1094,7 +1093,7 @@ TEST_F(VideoSendStreamTest, CapturesTextureAndI420VideoFrames) {
// Test if the input and output frames are the same. render_time_ms and // Test if the input and output frames are the same. render_time_ms and
// timestamp are not compared because capturer sets those values. // timestamp are not compared because capturer sets those values.
ExpectEqualFramesVector(input_frames.get(), observer.output_frames()); ExpectEqualFramesVector(input_frames, observer.output_frames());
DestroyStreams(); DestroyStreams();
} }
@ -1140,28 +1139,22 @@ void ExpectEqualBufferFrames(const I420VideoFrame& frame1,
frame1.allocated_size(kVPlane))); frame1.allocated_size(kVPlane)));
} }
void ExpectEqualFramesVector(const std::vector<I420VideoFrame*>& frames1, void ExpectEqualFramesVector(const std::vector<I420VideoFrame>& frames1,
const std::vector<I420VideoFrame*>& frames2) { const std::vector<I420VideoFrame>& frames2) {
EXPECT_EQ(frames1.size(), frames2.size()); EXPECT_EQ(frames1.size(), frames2.size());
for (size_t i = 0; i < std::min(frames1.size(), frames2.size()); ++i) for (size_t i = 0; i < std::min(frames1.size(), frames2.size()); ++i)
ExpectEqualFrames(*frames1[i], *frames2[i]); ExpectEqualFrames(frames1[i], frames2[i]);
} }
I420VideoFrame* CreateI420VideoFrame(int width, int height, uint8_t data) { I420VideoFrame CreateI420VideoFrame(int width, int height, uint8_t data) {
I420VideoFrame* frame = new I420VideoFrame();
const int kSizeY = width * height * 2; const int kSizeY = width * height * 2;
rtc::scoped_ptr<uint8_t[]> buffer(new uint8_t[kSizeY]); rtc::scoped_ptr<uint8_t[]> buffer(new uint8_t[kSizeY]);
memset(buffer.get(), data, kSizeY); memset(buffer.get(), data, kSizeY);
frame->CreateFrame(buffer.get(), I420VideoFrame frame;
buffer.get(), frame.CreateFrame(buffer.get(), buffer.get(), buffer.get(), width, height,
buffer.get(), width, width / 2, width / 2);
width, frame.set_timestamp(data);
height, frame.set_render_time_ms(data);
width,
width / 2,
width / 2);
frame->set_timestamp(data);
frame->set_render_time_ms(data);
return frame; return frame;
} }

4
webrtc/video_frame.h
View File

@ -87,10 +87,6 @@ class I420VideoFrame {
// reference to the video buffer also retained by |videoFrame|. // reference to the video buffer also retained by |videoFrame|.
void ShallowCopy(const I420VideoFrame& videoFrame); void ShallowCopy(const I420VideoFrame& videoFrame);
// Make a copy of |this|. The caller owns the returned frame.
// Return value: a new frame on success, NULL on error.
I420VideoFrame* CloneFrame() const;
// Swap Frame. // Swap Frame.
void SwapFrame(I420VideoFrame* videoFrame); void SwapFrame(I420VideoFrame* videoFrame);