| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_VPX_VIDEO_DECODER_H_ | 5 #ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ |
| 6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ | 6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ |
| 7 | 7 |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "media/base/demuxer_stream.h" | 10 #include "media/base/demuxer_stream.h" |
| 11 #include "media/base/video_decoder.h" | 11 #include "media/base/video_decoder.h" |
| 12 #include "media/base/video_decoder_config.h" | 12 #include "media/base/video_decoder_config.h" |
| 13 #include "media/base/video_frame.h" | 13 #include "media/base/video_frame.h" |
| 14 #include "media/base/video_frame_pool.h" |
| 14 | 15 |
| 15 struct vpx_codec_ctx; | 16 struct vpx_codec_ctx; |
| 16 struct vpx_image; | 17 struct vpx_image; |
| 17 | 18 |
| 18 namespace base { | 19 namespace base { |
| 19 class MessageLoopProxy; | 20 class MessageLoopProxy; |
| 20 } | 21 } |
| 21 | 22 |
| 22 namespace media { | 23 namespace media { |
| 23 | 24 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 DecoderState state_; | 74 DecoderState state_; |
| 74 | 75 |
| 75 DecodeCB decode_cb_; | 76 DecodeCB decode_cb_; |
| 76 base::Closure reset_cb_; | 77 base::Closure reset_cb_; |
| 77 | 78 |
| 78 VideoDecoderConfig config_; | 79 VideoDecoderConfig config_; |
| 79 | 80 |
| 80 vpx_codec_ctx* vpx_codec_; | 81 vpx_codec_ctx* vpx_codec_; |
| 81 vpx_codec_ctx* vpx_codec_alpha_; | 82 vpx_codec_ctx* vpx_codec_alpha_; |
| 82 | 83 |
| 84 VideoFramePool frame_pool_; |
| 85 |
| 83 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder); | 86 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder); |
| 84 }; | 87 }; |
| 85 | 88 |
| 86 } // namespace media | 89 } // namespace media |
| 87 | 90 |
| 88 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ | 91 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ |
| OLD | NEW |