commit ac27e204772c99d4df66a8c0c2c98e5ba59c1fc7
author Magnus Jedvert <magjed@google.com> Tue Mar 24 15:18:39 2015 +0100
committer Magnus Jedvert <magjed@google.com> Tue Mar 24 14:18:52 2015 +0000
tree 5254f7e35ce0633a5e958b8feea7e304169adf2f
parent 45636ece8a9fe79d14f0d9c5bf4a8270d71647fd

Delete VideoAdapter::AdaptFrame

This CL deletes VideoAdapter::AdaptFrame and replaces the remaining calls with AdaptFrameResolution instead.

I do not expect this CL to fix the flaky VideoAdapterTests yet. I intend to replace FileVideoCapturer with a deterministic FakeVideoCapturer in a follow-up CL.

BUG=4317
R=pbos@webrtc.org, pthatcher@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8848}

talk/media/base/videoadapter.h

diff --git a/talk/media/base/videoadapter.h b/talk/media/base/videoadapter.h
index 0be4ad7..58d2f03 100644
--- a/talk/media/base/videoadapter.h
+++ b/talk/media/base/videoadapter.h
@@ -53,7 +53,8 @@
   int GetOutputNumPixels() const;
 
   const VideoFormat& input_format();
-  // Returns true if the adapter is dropping frames in calls to AdaptFrame.
+  // Returns true if the adapter will always return zero size from
+  // AdaptFrameResolution.
   bool drops_all_frames() const;
   const VideoFormat& output_format();
 
@@ -61,18 +62,6 @@
   // resolution will be 0x0 if the frame should be dropped.
   VideoFormat AdaptFrameResolution(int in_width, int in_height);
 
-  // Adapt the input frame from the input format to the output format. Return
-  // true and set the output frame to NULL if the input frame is dropped. Return
-  // true and set the out frame to output_frame_ if the input frame is adapted
-  // successfully. Return false otherwise.
-  // Note that, if no adaptation is required, |out_frame| will refer directly
-  // in_frame. If a copy is always required, the caller must do an explicit
-  // copy.
-  // If a copy has taken place, |output_frame_| is owned by the VideoAdapter
-  // and will remain usable until the adapter is destroyed or AdaptFrame is
-  // called again.
-  bool AdaptFrame(VideoFrame* in_frame, VideoFrame** out_frame);
-
   void set_scale_third(bool enable);
   bool scale_third() const { return scale_third_; }
 
@@ -88,7 +77,6 @@
   float FindScale(const float* scale_factors,
                   const float upbias, int width, int height,
                   int target_num_pixels);
-  bool StretchToOutputFrame(const VideoFrame* in_frame);
 
   VideoFormat input_format_;
   VideoFormat output_format_;
@@ -101,7 +89,6 @@
   size_t previous_width_;  // Previous adapter output width.
   size_t previous_height_;  // Previous adapter output height.
   int64 interval_next_frame_;
-  rtc::scoped_ptr<VideoFrame> output_frame_;
   // The critical section to protect the above variables.
   rtc::CriticalSection critical_section_;