OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
| 9 #include "base/macros.h" |
9 #include "media/base/android/media_codec_decoder.h" | 10 #include "media/base/android/media_codec_decoder.h" |
10 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
11 #include "ui/gl/android/scoped_java_surface.h" | 12 #include "ui/gl/android/scoped_java_surface.h" |
12 | 13 |
13 namespace media { | 14 namespace media { |
14 | 15 |
15 // Video decoder for MediaCodecPlayer | 16 // Video decoder for MediaCodecPlayer |
16 class MediaCodecVideoDecoder : public MediaCodecDecoder { | 17 class MediaCodecVideoDecoder : public MediaCodecDecoder { |
17 public: | 18 public: |
18 // Typedefs for the notification callbacks | 19 // Typedefs for the notification callbacks |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 | 119 |
119 // Mantain the last seen PTS for stand-alone EOS. | 120 // Mantain the last seen PTS for stand-alone EOS. |
120 base::TimeDelta last_seen_pts_; | 121 base::TimeDelta last_seen_pts_; |
121 | 122 |
122 DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder); | 123 DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder); |
123 }; | 124 }; |
124 | 125 |
125 } // namespace media | 126 } // namespace media |
126 | 127 |
127 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ | 128 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
OLD | NEW |