| 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 #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" | |
| 16 #include "media/video/video_decode_engine.h" | 15 #include "media/video/video_decode_engine.h" |
| 17 | 16 |
| 18 namespace media { | 17 namespace media { |
| 19 | 18 |
| 20 class VideoDecodeEngine; | 19 class VideoDecodeEngine; |
| 21 | 20 |
| 22 class MEDIA_EXPORT FFmpegVideoDecoder | 21 class MEDIA_EXPORT FFmpegVideoDecoder |
| 23 : public VideoDecoder, | 22 : public VideoDecoder, |
| 24 public VideoDecodeEngine::EventHandler { | 23 public VideoDecodeEngine::EventHandler { |
| 25 public: | 24 public: |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 110 |
| 112 // Pointer to the demuxer stream that will feed us compressed buffers. | 111 // Pointer to the demuxer stream that will feed us compressed buffers. |
| 113 scoped_refptr<DemuxerStream> demuxer_stream_; | 112 scoped_refptr<DemuxerStream> demuxer_stream_; |
| 114 | 113 |
| 115 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); | 114 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); |
| 116 }; | 115 }; |
| 117 | 116 |
| 118 } // namespace media | 117 } // namespace media |
| 119 | 118 |
| 120 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ | 119 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ |
| OLD | NEW |