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

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

Issue 1525003002: Revert of Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix rebase errors 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
Index: media/base/android/media_codec_decoder.cc
diff --git a/media/base/android/media_codec_decoder.cc b/media/base/android/media_codec_decoder.cc
index 67d71887940b545ff604624670f88921def3fd43..cdbaf07c1713259554350f27e3c85d5e9d4bc5db 100644
--- a/media/base/android/media_codec_decoder.cc
+++ b/media/base/android/media_codec_decoder.cc
@@ -738,7 +738,9 @@ bool MediaCodecDecoder::EnqueueInputBuffer() {
<< " subsamples size:" << unit->subsamples.size();
status = media_codec_bridge_->QueueSecureInputBuffer(
- index, &unit->data[0], unit->data.size(), unit->key_id, unit->iv,
+ index, &unit->data[0], unit->data.size(),
+ reinterpret_cast<const uint8_t*>(&unit->key_id[0]), unit->key_id.size(),
+ reinterpret_cast<const uint8_t*>(&unit->iv[0]), unit->iv.size(),
unit->subsamples.empty() ? nullptr : &unit->subsamples[0],
unit->subsamples.size(), unit->timestamp);
}
« no previous file with comments | « media/base/android/media_codec_bridge_unittest.cc ('k') | media/base/android/media_codec_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698