| Index: media/filters/video_frame_generator.cc
|
| diff --git a/media/filters/video_frame_generator.cc b/media/filters/video_frame_generator.cc
|
| index b8819d459d5c0c79c81162235a9fdef6389ae678..767c0b46b6ea699991c96ea2eaa8edaf919ce0ab 100644
|
| --- a/media/filters/video_frame_generator.cc
|
| +++ b/media/filters/video_frame_generator.cc
|
| @@ -16,7 +16,7 @@ VideoFrameGenerator::VideoFrameGenerator(
|
| const gfx::Size& size,
|
| const base::TimeDelta& frame_duration)
|
| : message_loop_proxy_(message_loop_proxy),
|
| - natural_size_(size),
|
| + size_(size),
|
| stopped_(true),
|
| frame_duration_(frame_duration) {
|
| }
|
| @@ -49,10 +49,6 @@ void VideoFrameGenerator::Stop(const base::Closure& closure) {
|
| base::Bind(&VideoFrameGenerator::StopOnDecoderThread, this, closure));
|
| }
|
|
|
| -const gfx::Size& VideoFrameGenerator::natural_size() {
|
| - return natural_size_;
|
| -}
|
| -
|
| VideoFrameGenerator::~VideoFrameGenerator() {}
|
|
|
| void VideoFrameGenerator::InitializeOnDecoderThread(
|
| @@ -77,8 +73,9 @@ void VideoFrameGenerator::ReadOnDecoderThread(const ReadCB& read_cb) {
|
| // TODO(scherkus): migrate this to proper buffer recycling.
|
| scoped_refptr<VideoFrame> video_frame =
|
| VideoFrame::CreateFrame(VideoFrame::YV12,
|
| - natural_size_.width(),
|
| - natural_size_.height(),
|
| + size_.width(),
|
| + size_.height(),
|
| + size_,
|
| current_time_);
|
| current_time_ += frame_duration_;
|
|
|
|
|