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

Side by Side Diff: media/base/android/ndk_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 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_NDK_MEDIA_CODEC_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
7 7
8 #include <media/NdkMediaCodec.h> 8 #include <media/NdkMediaCodec.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 25 matching lines...) Expand all
36 base::TimeDelta presentation_time) override; 36 base::TimeDelta presentation_time) override;
37 using MediaCodecBridge::QueueSecureInputBuffer; 37 using MediaCodecBridge::QueueSecureInputBuffer;
38 MediaCodecStatus QueueSecureInputBuffer( 38 MediaCodecStatus QueueSecureInputBuffer(
39 int index, 39 int index,
40 const uint8_t* data, 40 const uint8_t* data,
41 size_t data_size, 41 size_t data_size,
42 const std::vector<char>& key_id, 42 const std::vector<char>& key_id,
43 const std::vector<char>& iv, 43 const std::vector<char>& iv,
44 const SubsampleEntry* subsamples, 44 const SubsampleEntry* subsamples,
45 int subsamples_size, 45 int subsamples_size,
46 const EncryptionScheme& encryption_scheme,
46 base::TimeDelta presentation_time) override; 47 base::TimeDelta presentation_time) override;
47 void QueueEOS(int input_buffer_index) override; 48 void QueueEOS(int input_buffer_index) override;
48 MediaCodecStatus DequeueInputBuffer(base::TimeDelta timeout, 49 MediaCodecStatus DequeueInputBuffer(base::TimeDelta timeout,
49 int* index) override; 50 int* index) override;
50 MediaCodecStatus DequeueOutputBuffer(base::TimeDelta timeout, 51 MediaCodecStatus DequeueOutputBuffer(base::TimeDelta timeout,
51 int* index, 52 int* index,
52 size_t* offset, 53 size_t* offset,
53 size_t* size, 54 size_t* size,
54 base::TimeDelta* presentation_time, 55 base::TimeDelta* presentation_time,
55 bool* end_of_stream, 56 bool* end_of_stream,
(...skipping 19 matching lines...) Expand all
75 }; 76 };
76 77
77 std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_; 78 std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
78 79
79 DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge); 80 DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
80 }; 81 };
81 82
82 } // namespace media 83 } // namespace media
83 84
84 #endif // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 85 #endif // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698