commit 32c784c26652e30fe55cc89799a823725ef5c14d
author magjed@webrtc.org <magjed@webrtc.org> Thu Feb 19 10:03:52 2015 +0000
committer magjed@webrtc.org <magjed@webrtc.org> Thu Feb 19 10:04:17 2015 +0000
tree e9d0c5917f9bf3ce39e593c49e0b288eea0bac2a
parent 3db042e2f09f1df7d8b5d40f30766f780848ecd9

ViEExternalRendererImpl: Remove dependency to webrtc::VideoFrame

I had to use std::vector, because rtc::Buffer wasn't in rtc_base_approved.

R=mflodman@webrtc.org, pbos@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8426}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8426 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/video_engine/vie_renderer.cc

diff --git a/webrtc/video_engine/vie_renderer.cc b/webrtc/video_engine/vie_renderer.cc
index faf9b95..38ba85c 100644
--- a/webrtc/video_engine/vie_renderer.cc
+++ b/webrtc/video_engine/vie_renderer.cc
@@ -149,8 +149,7 @@
     : external_renderer_(NULL),
       external_renderer_format_(kVideoUnknown),
       external_renderer_width_(0),
-      external_renderer_height_(0),
-      converted_frame_(new VideoFrame()) {
+      external_renderer_height_(0) {
 }
 
 int ViEExternalRendererImpl::SetViEExternalRenderer(
@@ -196,8 +195,6 @@
     return 0;
   }
 
-  VideoFrame* out_frame = converted_frame_.get();
-
   // Convert to requested format.
   VideoType type =
       RawVideoTypeToCommonVideoVideoType(external_renderer_format_);
@@ -208,7 +205,8 @@
     assert(false);
     return -1;
   }
-  converted_frame_->VerifyAndAllocate(buffer_size);
+  converted_frame_.resize(buffer_size);
+  uint8_t* out_frame = &converted_frame_[0];
 
   switch (external_renderer_format_) {
     case kVideoYV12:
@@ -218,13 +216,9 @@
     case kVideoRGB24:
     case kVideoRGB565:
     case kVideoARGB4444:
-    case kVideoARGB1555 :
-      {
-        if (ConvertFromI420(video_frame, type, 0,
-                            converted_frame_->Buffer()) < 0)
-          return -1;
-        converted_frame_->SetLength(buffer_size);
-      }
+    case kVideoARGB1555:
+      if (ConvertFromI420(video_frame, type, 0, out_frame) < 0)
+        return -1;
       break;
     case kVideoIYUV:
       // no conversion available
@@ -238,8 +232,8 @@
   NotifyFrameSizeChange(stream_id, video_frame);
 
   if (out_frame) {
-    external_renderer_->DeliverFrame(out_frame->Buffer(),
-                                     out_frame->Length(),
+    external_renderer_->DeliverFrame(out_frame,
+                                     converted_frame_.size(),
                                      video_frame.timestamp(),
                                      video_frame.ntp_time_ms(),
                                      video_frame.render_time_ms(),

webrtc/video_engine/vie_renderer.h

diff --git a/webrtc/video_engine/vie_renderer.h b/webrtc/video_engine/vie_renderer.h
index b999c1f..ff0c1e9 100644
--- a/webrtc/video_engine/vie_renderer.h
+++ b/webrtc/video_engine/vie_renderer.h
@@ -11,8 +11,9 @@
 #ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
 #define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
 
+#include <vector>
+
 #include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/video_engine/include/vie_render.h"
 #include "webrtc/video_engine/vie_frame_provider_base.h"
 
@@ -44,7 +45,7 @@
   int external_renderer_width_;
   int external_renderer_height_;
   // Converted_frame_ in color format specified by render_format_.
-  scoped_ptr<VideoFrame> converted_frame_;
+  std::vector<uint8_t> converted_frame_;
 };
 
 class ViERenderer: public ViEFrameCallback {