Cast: Switching recevier to use media::VideoFrame

media/cast/test/end2end_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This test generate synthetic data. For audio it's a sinusoid waveform with
 // frequency kSoundFrequency and different amplitudes. For video it's a pattern
 // that is shifting by one pixel per frame, each pixels neighbors right and down
 // is this pixels value +1, since the pixel value is 8 bit it will wrap
 // frequently within the image. Visually this will create diagonally color bands
 // that moves across the screen
@@ skipping 255 matching lines @@
                          int height,
                          const base::TimeTicks& capture_time) {
     ExpectedVideoFrame expected_video_frame;
     expected_video_frame.start_value = start_value;
     expected_video_frame.capture_time = capture_time;
     expected_video_frame.width = width;
     expected_video_frame.height = height;
     expected_frame_.push_back(expected_video_frame);
   }
 
-  void CheckVideoFrame(scoped_ptr<I420VideoFrame> video_frame,
+  void CheckVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame,
                        const base::TimeTicks& render_time) {
     ++num_called_;
 
     EXPECT_FALSE(expected_frame_.empty());  // Test for bug in test code.
     ExpectedVideoFrame expected_video_frame = expected_frame_.front();
     expected_frame_.pop_front();
 
     base::TimeDelta time_since_capture =
        render_time - expected_video_frame.capture_time;
     const base::TimeDelta upper_bound = base::TimeDelta::FromMilliseconds(
         kDefaultRtpMaxDelayMs + kTimerErrorMs);
 
     EXPECT_GE(upper_bound, time_since_capture)
         << "time_since_capture - upper_bound == "
         << (time_since_capture - upper_bound).InMicroseconds() << " usec";
     EXPECT_LE(expected_video_frame.capture_time, render_time);
-    EXPECT_EQ(expected_video_frame.width, video_frame->width);
-    EXPECT_EQ(expected_video_frame.height, video_frame->height);
+    EXPECT_EQ(expected_video_frame.width, video_frame->coded_size().width());
+    EXPECT_EQ(expected_video_frame.height, video_frame->coded_size().height());
 
     gfx::Size size(expected_video_frame.width, expected_video_frame.height);
     scoped_refptr<media::VideoFrame> expected_I420_frame =
         media::VideoFrame::CreateFrame(
         VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
     PopulateVideoFrame(expected_I420_frame, expected_video_frame.start_value);
 
-    double psnr = I420PSNR(*(expected_I420_frame.get()), *(video_frame.get()));
-    EXPECT_GE(psnr, kVideoAcceptedPSNR);
+    EXPECT_GE(I420PSNR(expected_I420_frame, video_frame), kVideoAcceptedPSNR);
   }
 
   int number_times_called() { return num_called_;}
 
  protected:
   virtual ~TestReceiverVideoCallback() {}
 
  private:
   friend class base::RefCountedThreadSafe<TestReceiverVideoCallback>;
 
@@ skipping 712 matching lines @@
 }
 
 
 // TODO(pwestin): Add repeatable packet loss test.
 // TODO(pwestin): Add test for misaligned send get calls.
 // TODO(pwestin): Add more tests that does not resample.
 // TODO(pwestin): Add test when we have starvation for our RunTask.
 
 }  // namespace cast
 }  // namespace media