OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_DECODER_JOB_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ |
6 #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/macros.h" |
9 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
10 #include "base/time/time.h" | 11 #include "base/time/time.h" |
11 #include "media/base/android/demuxer_stream_player_params.h" | 12 #include "media/base/android/demuxer_stream_player_params.h" |
12 #include "media/base/android/media_codec_bridge.h" | 13 #include "media/base/android/media_codec_bridge.h" |
13 #include "ui/gl/android/scoped_java_surface.h" | 14 #include "ui/gl/android/scoped_java_surface.h" |
14 | 15 |
15 namespace base { | 16 namespace base { |
16 class SingleThreadTaskRunner; | 17 class SingleThreadTaskRunner; |
17 } | 18 } |
18 | 19 |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 // This access unit is passed to the decoder during config changes to drain | 361 // This access unit is passed to the decoder during config changes to drain |
361 // the decoder. | 362 // the decoder. |
362 AccessUnit eos_unit_; | 363 AccessUnit eos_unit_; |
363 | 364 |
364 DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob); | 365 DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob); |
365 }; | 366 }; |
366 | 367 |
367 } // namespace media | 368 } // namespace media |
368 | 369 |
369 #endif // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ | 370 #endif // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ |
OLD | NEW |