| Index: media/cast/test/video_utility.h
|
| diff --git a/media/cast/test/video_utility.h b/media/cast/test/video_utility.h
|
| index 464dff28939d342a04d68cc2a044f55652b934dd..9f943b05e3c2de6b6a5f736e8bfb2d053f4eb685 100644
|
| --- a/media/cast/test/video_utility.h
|
| +++ b/media/cast/test/video_utility.h
|
| @@ -5,23 +5,18 @@
|
| // Utility functions for video testing.
|
|
|
| #include "media/base/video_frame.h"
|
| -#include "media/cast/cast_config.h"
|
|
|
| namespace media {
|
| namespace cast {
|
|
|
| // Compute and return PSNR between two frames.
|
| -double I420PSNR(const I420VideoFrame& frame1, const I420VideoFrame& frame2);
|
| -
|
| -// Temporary function to handle the transition
|
| -// from I420VideoFrame->media::VideoFrame.
|
| -double I420PSNR(const VideoFrame& frame1, const I420VideoFrame& frame2);
|
| +double I420PSNR(const scoped_refptr<media::VideoFrame>& frame1,
|
| + const scoped_refptr<media::VideoFrame>& frame2);
|
|
|
| // Populate a video frame with values starting with the given start value.
|
| // Width, height and stride should be set in advance.
|
| // Memory is allocated within the function.
|
| void PopulateVideoFrame(VideoFrame* frame, int start_value);
|
| -void PopulateVideoFrame(I420VideoFrame* frame, int start_value);
|
|
|
| // Populate a video frame from a file.
|
| // Returns true if frame was populated, false if not (EOF).
|
|
|