| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_CODEC_BRIDGE_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ |
| 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 const base::TimeDelta& presentation_time); | 122 const base::TimeDelta& presentation_time); |
| 123 | 123 |
| 124 // Similar to the above call, but submits a buffer that is encrypted. Note: | 124 // Similar to the above call, but submits a buffer that is encrypted. Note: |
| 125 // NULL |subsamples| indicates the whole buffer is encrypted. If |data| is | 125 // NULL |subsamples| indicates the whole buffer is encrypted. If |data| is |
| 126 // NULL, assume the input buffer has already been populated (but still obey | 126 // NULL, assume the input buffer has already been populated (but still obey |
| 127 // |data_size|). |data_size| must be less than kint32max (because Java). | 127 // |data_size|). |data_size| must be less than kint32max (because Java). |
| 128 MediaCodecStatus QueueSecureInputBuffer( | 128 MediaCodecStatus QueueSecureInputBuffer( |
| 129 int index, | 129 int index, |
| 130 const uint8* data, | 130 const uint8* data, |
| 131 size_t data_size, | 131 size_t data_size, |
| 132 const std::string& key_id, |
| 133 const std::string& iv, |
| 134 const std::vector<SubsampleEntry>& subsamples, |
| 135 const base::TimeDelta& presentation_time); |
| 136 |
| 137 // Same QueueSecureInputBuffer overriden for the use with MediaSourcePlayer |
| 138 // and MediaCodecPlayer. |
| 139 // TODO(timav): remove this method and keep only the one above after we |
| 140 // switch to the Spitzer pipeline. |
| 141 MediaCodecStatus QueueSecureInputBuffer( |
| 142 int index, |
| 143 const uint8* data, |
| 144 size_t data_size, |
| 132 const uint8* key_id, | 145 const uint8* key_id, |
| 133 int key_id_size, | 146 int key_id_size, |
| 134 const uint8* iv, | 147 const uint8* iv, |
| 135 int iv_size, | 148 int iv_size, |
| 136 const SubsampleEntry* subsamples, | 149 const SubsampleEntry* subsamples, |
| 137 int subsamples_size, | 150 int subsamples_size, |
| 138 const base::TimeDelta& presentation_time); | 151 const base::TimeDelta& presentation_time); |
| 139 | 152 |
| 140 // Submits an empty buffer with a EOS (END OF STREAM) flag. | 153 // Submits an empty buffer with a EOS (END OF STREAM) flag. |
| 141 void QueueEOS(int input_buffer_index); | 154 void QueueEOS(int input_buffer_index); |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 VideoCodecBridge(const std::string& mime, | 320 VideoCodecBridge(const std::string& mime, |
| 308 bool is_secure, | 321 bool is_secure, |
| 309 MediaCodecDirection direction); | 322 MediaCodecDirection direction); |
| 310 | 323 |
| 311 int adaptive_playback_supported_for_testing_; | 324 int adaptive_playback_supported_for_testing_; |
| 312 }; | 325 }; |
| 313 | 326 |
| 314 } // namespace media | 327 } // namespace media |
| 315 | 328 |
| 316 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ | 329 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ |
| OLD | NEW |