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

Side by Side Diff: media/filters/ffmpeg_video_decoder.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/filters/ffmpeg_h264_bitstream_converter.h ('k') | media/filters/file_data_source.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_FILTERS_FFMPEG_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/time.h" 11 #include "base/time.h"
12 #include "media/base/filters.h" 12 #include "media/base/filters.h"
13 #include "media/base/pts_stream.h" 13 #include "media/base/pts_stream.h"
14 #include "media/base/video_frame.h" 14 #include "media/base/video_frame.h"
15 #include "media/filters/decoder_base.h" 15 #include "media/filters/decoder_base.h"
16 #include "media/video/video_decode_engine.h" 16 #include "media/video/video_decode_engine.h"
17 17
18 namespace media { 18 namespace media {
19 19
20 class VideoDecodeEngine; 20 class VideoDecodeEngine;
21 21
22 class MEDIA_EXPORT FFmpegVideoDecoder 22 class FFmpegVideoDecoder
23 : public VideoDecoder, 23 : public VideoDecoder,
24 public VideoDecodeEngine::EventHandler { 24 public VideoDecodeEngine::EventHandler {
25 public: 25 public:
26 FFmpegVideoDecoder(MessageLoop* message_loop, 26 FFmpegVideoDecoder(MessageLoop* message_loop,
27 VideoDecodeContext* decode_context); 27 VideoDecodeContext* decode_context);
28 virtual ~FFmpegVideoDecoder(); 28 virtual ~FFmpegVideoDecoder();
29 29
30 // Filter implementation. 30 // Filter implementation.
31 virtual void Stop(FilterCallback* callback) OVERRIDE; 31 virtual void Stop(FilterCallback* callback) OVERRIDE;
32 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE; 32 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 // Pointer to the demuxer stream that will feed us compressed buffers. 112 // Pointer to the demuxer stream that will feed us compressed buffers.
113 scoped_refptr<DemuxerStream> demuxer_stream_; 113 scoped_refptr<DemuxerStream> demuxer_stream_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 115 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
116 }; 116 };
117 117
118 } // namespace media 118 } // namespace media
119 119
120 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 120 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_h264_bitstream_converter.h ('k') | media/filters/file_data_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698