Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: media/base/android/sdk_media_codec_bridge.h

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_SDK_MEDIA_CODEC_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 30 matching lines...) Expand all
41 base::TimeDelta presentation_time) override; 41 base::TimeDelta presentation_time) override;
42 using MediaCodecBridge::QueueSecureInputBuffer; 42 using MediaCodecBridge::QueueSecureInputBuffer;
43 MediaCodecStatus QueueSecureInputBuffer( 43 MediaCodecStatus QueueSecureInputBuffer(
44 int index, 44 int index,
45 const uint8_t* data, 45 const uint8_t* data,
46 size_t data_size, 46 size_t data_size,
47 const std::vector<char>& key_id, 47 const std::vector<char>& key_id,
48 const std::vector<char>& iv, 48 const std::vector<char>& iv,
49 const SubsampleEntry* subsamples, 49 const SubsampleEntry* subsamples,
50 int subsamples_size, 50 int subsamples_size,
51 const EncryptionScheme& encryption_scheme,
51 base::TimeDelta presentation_time) override; 52 base::TimeDelta presentation_time) override;
52 void QueueEOS(int input_buffer_index) override; 53 void QueueEOS(int input_buffer_index) override;
53 MediaCodecStatus DequeueInputBuffer(base::TimeDelta timeout, 54 MediaCodecStatus DequeueInputBuffer(base::TimeDelta timeout,
54 int* index) override; 55 int* index) override;
55 MediaCodecStatus DequeueOutputBuffer(base::TimeDelta timeout, 56 MediaCodecStatus DequeueOutputBuffer(base::TimeDelta timeout,
56 int* index, 57 int* index,
57 size_t* offset, 58 size_t* offset,
58 size_t* size, 59 size_t* size,
59 base::TimeDelta* presentation_time, 60 base::TimeDelta* presentation_time,
60 bool* end_of_stream, 61 bool* end_of_stream,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool is_secure, 184 bool is_secure,
184 MediaCodecDirection direction, 185 MediaCodecDirection direction,
185 bool require_software_codec); 186 bool require_software_codec);
186 187
187 int adaptive_playback_supported_for_testing_; 188 int adaptive_playback_supported_for_testing_;
188 }; 189 };
189 190
190 } // namespace media 191 } // namespace media
191 192
192 #endif // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_ 193 #endif // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698