Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Side by Side Diff: media/video/ffmpeg_video_decode_engine.h

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable DecodeFrame_LargerXXX tests to make Valgrind happy. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/media.gyp ('k') | media/video/ffmpeg_video_decode_engine.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_ 5 #ifndef MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
6 #define MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_ 6 #define MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 15 matching lines...) Expand all
26 virtual void Initialize(MessageLoop* message_loop, 26 virtual void Initialize(MessageLoop* message_loop,
27 VideoDecodeEngine::EventHandler* event_handler, 27 VideoDecodeEngine::EventHandler* event_handler,
28 VideoDecodeContext* context, 28 VideoDecodeContext* context,
29 const VideoDecoderConfig& config); 29 const VideoDecoderConfig& config);
30 virtual void ConsumeVideoSample(scoped_refptr<Buffer> buffer); 30 virtual void ConsumeVideoSample(scoped_refptr<Buffer> buffer);
31 virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> frame); 31 virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> frame);
32 virtual void Uninitialize(); 32 virtual void Uninitialize();
33 virtual void Flush(); 33 virtual void Flush();
34 virtual void Seek(); 34 virtual void Seek();
35 35
36 VideoFrame::Format GetSurfaceFormat() const;
37
38 private: 36 private:
39 void DecodeFrame(scoped_refptr<Buffer> buffer); 37 void DecodeFrame(scoped_refptr<Buffer> buffer);
40 void ReadInput(); 38 void ReadInput();
41 void TryToFinishPendingFlush(); 39 void TryToFinishPendingFlush();
42 40
43 AVCodecContext* codec_context_; 41 AVCodecContext* codec_context_;
44 scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> av_frame_; 42 scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> av_frame_;
45 VideoDecodeEngine::EventHandler* event_handler_; 43 VideoDecodeEngine::EventHandler* event_handler_;
46 44
47 // Frame rate of the video. 45 // Frame rate of the video.
(...skipping 18 matching lines...) Expand all
66 64
67 // Whether flush operation is pending. 65 // Whether flush operation is pending.
68 bool flush_pending_; 66 bool flush_pending_;
69 67
70 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecodeEngine); 68 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecodeEngine);
71 }; 69 };
72 70
73 } // namespace media 71 } // namespace media
74 72
75 #endif // MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_ 73 #endif // MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/video/ffmpeg_video_decode_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698