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

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

Issue 2382023005: Fix nits leftover from WMPA MSE deletion. (Closed)
Patch Set: Created 4 years, 2 months 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_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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // |data_size|). |data_size| must be less than kint32max (because Java). 96 // |data_size|). |data_size| must be less than kint32max (because Java).
97 MediaCodecStatus QueueSecureInputBuffer( 97 MediaCodecStatus QueueSecureInputBuffer(
98 int index, 98 int index,
99 const uint8_t* data, 99 const uint8_t* data,
100 size_t data_size, 100 size_t data_size,
101 const std::string& key_id, 101 const std::string& key_id,
102 const std::string& iv, 102 const std::string& iv,
103 const std::vector<SubsampleEntry>& subsamples, 103 const std::vector<SubsampleEntry>& subsamples,
104 base::TimeDelta presentation_time); 104 base::TimeDelta presentation_time);
105 105
106 // Same QueueSecureInputBuffer overriden for the use with MediaCodecPlayer. 106 // Same QueueSecureInputBuffer overriden for the use with
107 // TODO(timav): remove this method and keep only the one above after we 107 // AndroidVideoDecodeAccelerator and MediaCodecAudioDecoder. TODO(timav):
108 // switch to the Spitzer pipeline. 108 // remove this method and keep only the one above after we switch to the
109 // Spitzer pipeline.
109 virtual MediaCodecStatus QueueSecureInputBuffer( 110 virtual MediaCodecStatus QueueSecureInputBuffer(
110 int index, 111 int index,
111 const uint8_t* data, 112 const uint8_t* data,
112 size_t data_size, 113 size_t data_size,
113 const std::vector<char>& key_id, 114 const std::vector<char>& key_id,
114 const std::vector<char>& iv, 115 const std::vector<char>& iv,
115 const SubsampleEntry* subsamples, 116 const SubsampleEntry* subsamples,
116 int subsamples_size, 117 int subsamples_size,
117 base::TimeDelta presentation_time) = 0; 118 base::TimeDelta presentation_time) = 0;
118 119
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 bool FillInputBuffer(int index, 185 bool FillInputBuffer(int index,
185 const uint8_t* data, 186 const uint8_t* data,
186 size_t data_size) WARN_UNUSED_RESULT; 187 size_t data_size) WARN_UNUSED_RESULT;
187 188
188 DISALLOW_COPY_AND_ASSIGN(MediaCodecBridge); 189 DISALLOW_COPY_AND_ASSIGN(MediaCodecBridge);
189 }; 190 };
190 191
191 } // namespace media 192 } // namespace media
192 193
193 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ 194 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698