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

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

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/video/capture/video_capture_proxy.h ('k') | media/video/picture.h » ('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"
11 #include "media/ffmpeg/ffmpeg_common.h" 11 #include "media/ffmpeg/ffmpeg_common.h"
12 #include "media/video/video_decode_engine.h" 12 #include "media/video/video_decode_engine.h"
13 13
14 // FFmpeg types. 14 // FFmpeg types.
15 struct AVCodecContext; 15 struct AVCodecContext;
16 struct AVFrame; 16 struct AVFrame;
17 17
18 namespace media { 18 namespace media {
19 19
20 class MEDIA_EXPORT FFmpegVideoDecodeEngine : public VideoDecodeEngine { 20 class FFmpegVideoDecodeEngine : public VideoDecodeEngine {
21 public: 21 public:
22 FFmpegVideoDecodeEngine(); 22 FFmpegVideoDecodeEngine();
23 virtual ~FFmpegVideoDecodeEngine(); 23 virtual ~FFmpegVideoDecodeEngine();
24 24
25 // Implementation of the VideoDecodeEngine Interface. 25 // Implementation of the VideoDecodeEngine Interface.
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);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 // Whether flush operation is pending. 67 // Whether flush operation is pending.
68 bool flush_pending_; 68 bool flush_pending_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecodeEngine); 70 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecodeEngine);
71 }; 71 };
72 72
73 } // namespace media 73 } // namespace media
74 74
75 #endif // MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_ 75 #endif // MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
OLDNEW
« no previous file with comments | « media/video/capture/video_capture_proxy.h ('k') | media/video/picture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698