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

Unified Diff: media/base/android/media_decoder_job.cc

Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crazy linker issue Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_codec_video_decoder.cc ('k') | media/base/android/media_jni_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index 868910764ed9127c38be4356117b13f8e7417da1..9e0a2168adb7b757fdd51f69d209a2091e57e83c 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -282,13 +282,9 @@ MediaCodecStatus MediaDecoderJob::QueueInputBuffer(const AccessUnit& unit) {
}
MediaCodecStatus status = media_codec_bridge_->QueueSecureInputBuffer(
- input_buf_index,
- &unit.data[0], unit.data.size(),
- reinterpret_cast<const uint8*>(&unit.key_id[0]), unit.key_id.size(),
- reinterpret_cast<const uint8*>(&unit.iv[0]), unit.iv.size(),
+ input_buf_index, &unit.data[0], unit.data.size(), unit.key_id, unit.iv,
unit.subsamples.empty() ? NULL : &unit.subsamples[0],
- unit.subsamples.size(),
- unit.timestamp);
+ unit.subsamples.size(), unit.timestamp);
// In case of MEDIA_CODEC_NO_KEY, we must reuse the |input_buf_index_|.
// Otherwise MediaDrm will report errors.
« no previous file with comments | « media/base/android/media_codec_video_decoder.cc ('k') | media/base/android/media_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698