summaryrefslogtreecommitdiffstats
path: root/media/video/ffmpeg_video_decode_engine.h
diff options
context:
space:
mode:
Diffstat (limited to 'media/video/ffmpeg_video_decode_engine.h')
-rw-r--r--media/video/ffmpeg_video_decode_engine.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/media/video/ffmpeg_video_decode_engine.h b/media/video/ffmpeg_video_decode_engine.h
index b9e76b7..53baa54 100644
--- a/media/video/ffmpeg_video_decode_engine.h
+++ b/media/video/ffmpeg_video_decode_engine.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -14,6 +14,7 @@
// FFmpeg types.
struct AVCodecContext;
struct AVFrame;
+struct AVStream;
namespace media {
@@ -35,21 +36,21 @@ class FFmpegVideoDecodeEngine : public VideoDecodeEngine {
virtual void Flush();
virtual void Seek();
- VideoFrame::Format GetSurfaceFormat() const;
+ virtual AVCodecContext* codec_context() const;
+
+ virtual void SetCodecContextForTest(AVCodecContext* context);
+ VideoFrame::Format GetSurfaceFormat() const;
private:
void DecodeFrame(scoped_refptr<Buffer> buffer);
void ReadInput();
void TryToFinishPendingFlush();
AVCodecContext* codec_context_;
+ AVStream* av_stream_;
scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> av_frame_;
VideoDecodeEngine::EventHandler* event_handler_;
- // Frame rate of the video.
- int frame_rate_numerator_;
- int frame_rate_denominator_;
-
// Whether direct rendering is used.
bool direct_rendering_;