* Update libjingle to 50389769.
* Together with "Add texture support for i420 video frame." from
wuchengli@chromium.org.
https://webrtc-codereview.appspot.com/1413004
RISK=P1
TESTED=try bots
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1967004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4489 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/utility/source/video_frames_queue.cc b/webrtc/modules/utility/source/video_frames_queue.cc
index 535660c..d3d37be 100644
--- a/webrtc/modules/utility/source/video_frames_queue.cc
+++ b/webrtc/modules/utility/source/video_frames_queue.cc
@@ -14,6 +14,7 @@
#include <assert.h>
+#include "webrtc/common_video/interface/texture_video_frame.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/system_wrappers/interface/trace.h"
@@ -48,6 +49,16 @@
}
int32_t VideoFramesQueue::AddFrame(const I420VideoFrame& newFrame) {
+ if (newFrame.native_handle() != NULL) {
+ _incomingFrames.PushBack(new TextureVideoFrame(
+ static_cast<NativeHandle*>(newFrame.native_handle()),
+ newFrame.width(),
+ newFrame.height(),
+ newFrame.timestamp(),
+ newFrame.render_time_ms()));
+ return 0;
+ }
+
I420VideoFrame* ptrFrameToAdd = NULL;
// Try to re-use a VideoFrame. Only allocate new memory if it is necessary.
if (!_emptyFrames.Empty()) {
@@ -113,12 +124,17 @@
}
int32_t VideoFramesQueue::ReturnFrame(I420VideoFrame* ptrOldFrame) {
- ptrOldFrame->set_timestamp(0);
- ptrOldFrame->set_width(0);
- ptrOldFrame->set_height(0);
- ptrOldFrame->set_render_time_ms(0);
- ptrOldFrame->ResetSize();
- _emptyFrames.PushBack(ptrOldFrame);
+ // No need to reuse texture frames because they do not allocate memory.
+ if (ptrOldFrame->native_handle() == NULL) {
+ ptrOldFrame->set_timestamp(0);
+ ptrOldFrame->set_width(0);
+ ptrOldFrame->set_height(0);
+ ptrOldFrame->set_render_time_ms(0);
+ ptrOldFrame->ResetSize();
+ _emptyFrames.PushBack(ptrOldFrame);
+ } else {
+ delete ptrOldFrame;
+ }
return 0;
}
diff --git a/webrtc/modules/video_render/incoming_video_stream.cc b/webrtc/modules/video_render/incoming_video_stream.cc
index eb602d1..39556d8 100644
--- a/webrtc/modules/video_render/incoming_video_stream.cc
+++ b/webrtc/modules/video_render/incoming_video_stream.cc
@@ -101,7 +101,8 @@
return -1;
}
- if (true == mirror_frames_enabled_) {
+ // Mirroring is not supported if the frame is backed by a texture.
+ if (true == mirror_frames_enabled_ && video_frame.native_handle() == NULL) {
transformed_video_frame_.CreateEmptyFrame(video_frame.width(),
video_frame.height(),
video_frame.stride(kYPlane),
diff --git a/webrtc/modules/video_render/video_render_frames.cc b/webrtc/modules/video_render/video_render_frames.cc
index 80b3d59..be5cac9 100644
--- a/webrtc/modules/video_render/video_render_frames.cc
+++ b/webrtc/modules/video_render/video_render_frames.cc
@@ -12,6 +12,7 @@
#include <assert.h>
+#include "webrtc/common_video/interface/texture_video_frame.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/system_wrappers/interface/trace.h"
@@ -47,6 +48,16 @@
return -1;
}
+ if (new_frame->native_handle() != NULL) {
+ incoming_frames_.PushBack(new TextureVideoFrame(
+ static_cast<NativeHandle*>(new_frame->native_handle()),
+ new_frame->width(),
+ new_frame->height(),
+ new_frame->timestamp(),
+ new_frame->render_time_ms()));
+ return incoming_frames_.GetSize();
+ }
+
// Get an empty frame
I420VideoFrame* frame_to_add = NULL;
if (!empty_frames_.Empty()) {
@@ -103,10 +114,7 @@
// This is the oldest one so far and it's OK to render.
if (render_frame) {
// This one is older than the newly found frame, remove this one.
- render_frame->ResetSize();
- render_frame->set_timestamp(0);
- render_frame->set_render_time_ms(0);
- empty_frames_.PushFront(render_frame);
+ ReturnFrame(render_frame);
}
render_frame = oldest_frame_in_list;
incoming_frames_.Erase(item);
@@ -122,10 +130,15 @@
}
int32_t VideoRenderFrames::ReturnFrame(I420VideoFrame* old_frame) {
- old_frame->ResetSize();
- old_frame->set_timestamp(0);
- old_frame->set_render_time_ms(0);
- empty_frames_.PushBack(old_frame);
+ // No need to reuse texture frames because they do not allocate memory.
+ if (old_frame->native_handle() == NULL) {
+ old_frame->ResetSize();
+ old_frame->set_timestamp(0);
+ old_frame->set_render_time_ms(0);
+ empty_frames_.PushBack(old_frame);
+ } else {
+ delete old_frame;
+ }
return 0;
}