| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/filters/ffmpeg_video_decoder.h" | 5 #include "media/filters/ffmpeg_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 av_frame_ = NULL; | 411 av_frame_ = NULL; |
| 412 } | 412 } |
| 413 } | 413 } |
| 414 | 414 |
| 415 scoped_refptr<VideoFrame> FFmpegVideoDecoder::AllocateVideoFrame() { | 415 scoped_refptr<VideoFrame> FFmpegVideoDecoder::AllocateVideoFrame() { |
| 416 VideoFrame::Format format = PixelFormatToVideoFormat(codec_context_->pix_fmt); | 416 VideoFrame::Format format = PixelFormatToVideoFormat(codec_context_->pix_fmt); |
| 417 size_t width = codec_context_->width; | 417 size_t width = codec_context_->width; |
| 418 size_t height = codec_context_->height; | 418 size_t height = codec_context_->height; |
| 419 | 419 |
| 420 return VideoFrame::CreateFrame(format, width, height, | 420 return VideoFrame::CreateFrame(format, width, height, |
| 421 kNoTimestamp, kNoTimestamp); | 421 kNoTimestamp(), kNoTimestamp()); |
| 422 } | 422 } |
| 423 | 423 |
| 424 } // namespace media | 424 } // namespace media |
| OLD | NEW |