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

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

Issue 2132653002: MediaCodecLoop unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cl feedback Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_codec_bridge.h ('k') | media/base/android/media_codec_direction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_codec_bridge.cc
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
index c28d460bbf270b97f423f051301a36a23223877a..de8bac38d922befdc0455ff1457f53b046c3256f 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -7,19 +7,9 @@
#include <algorithm>
#include <limits>
-#include "base/android/build_info.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_array.h"
-#include "base/android/jni_string.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
-#include "media/base/decrypt_config.h"
-
-using base::android::AttachCurrentThread;
-using base::android::ConvertJavaStringToUTF8;
-using base::android::ConvertUTF8ToJavaString;
-using base::android::JavaIntArrayToIntVector;
-using base::android::ScopedJavaLocalRef;
+#include "media/base/subsample_entry.h"
namespace media {
@@ -39,7 +29,7 @@ MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
const std::vector<char> iv_vec(iv.begin(), iv.end());
return QueueSecureInputBuffer(index, data, data_size, key_vec, iv_vec,
subsamples.empty() ? nullptr : &subsamples[0],
- subsamples.size(), presentation_time);
+ (int)subsamples.size(), presentation_time);
}
MediaCodecStatus MediaCodecBridge::CopyFromOutputBuffer(int index,
« no previous file with comments | « media/base/android/media_codec_bridge.h ('k') | media/base/android/media_codec_direction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698