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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <memory> |
9 | 10 |
10 #include "base/callback.h" | 11 #include "base/callback.h" |
11 #include "base/macros.h" | 12 #include "base/macros.h" |
12 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
14 #include "media/base/android/demuxer_stream_player_params.h" | 15 #include "media/base/android/demuxer_stream_player_params.h" |
15 #include "media/base/android/media_codec_bridge.h" | 16 #include "media/base/android/media_codec_bridge.h" |
16 #include "ui/gl/android/scoped_java_surface.h" | 17 #include "ui/gl/android/scoped_java_surface.h" |
17 | 18 |
18 namespace base { | 19 namespace base { |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 bool SetCurrentFrameToPreviouslyCachedKeyFrame(); | 155 bool SetCurrentFrameToPreviouslyCachedKeyFrame(); |
155 | 156 |
156 MediaDrmBridge* drm_bridge() { return drm_bridge_; } | 157 MediaDrmBridge* drm_bridge() { return drm_bridge_; } |
157 | 158 |
158 void set_is_content_encrypted(bool is_content_encrypted) { | 159 void set_is_content_encrypted(bool is_content_encrypted) { |
159 is_content_encrypted_ = is_content_encrypted; | 160 is_content_encrypted_ = is_content_encrypted; |
160 } | 161 } |
161 | 162 |
162 bool need_to_reconfig_decoder_job_; | 163 bool need_to_reconfig_decoder_job_; |
163 | 164 |
164 scoped_ptr<MediaCodecBridge> media_codec_bridge_; | 165 std::unique_ptr<MediaCodecBridge> media_codec_bridge_; |
165 | 166 |
166 private: | 167 private: |
167 friend class MediaSourcePlayerTest; | 168 friend class MediaSourcePlayerTest; |
168 | 169 |
169 // Causes this instance to be deleted on the thread it is bound to. | 170 // Causes this instance to be deleted on the thread it is bound to. |
170 void Release(); | 171 void Release(); |
171 | 172 |
172 // Queues an access unit into |media_codec_bridge_|'s input buffer. | 173 // Queues an access unit into |media_codec_bridge_|'s input buffer. |
173 MediaCodecStatus QueueInputBuffer(const AccessUnit& unit); | 174 MediaCodecStatus QueueInputBuffer(const AccessUnit& unit); |
174 | 175 |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 // This access unit is passed to the decoder during config changes to drain | 364 // This access unit is passed to the decoder during config changes to drain |
364 // the decoder. | 365 // the decoder. |
365 AccessUnit eos_unit_; | 366 AccessUnit eos_unit_; |
366 | 367 |
367 DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob); | 368 DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob); |
368 }; | 369 }; |
369 | 370 |
370 } // namespace media | 371 } // namespace media |
371 | 372 |
372 #endif // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ | 373 #endif // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ |
OLD | NEW |