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

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

Issue 2132653002: MediaCodecLoop unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed constexpr for windows compiler bug 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
Index: media/base/android/sdk_media_codec_bridge.cc
diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
index 59a40083d11aac231ff23420b7dc4120b53b5e48..a7fe13bb4329c964ef67684fdc8534e15e3e655f 100644
--- a/media/base/android/sdk_media_codec_bridge.cc
+++ b/media/base/android/sdk_media_codec_bridge.cc
@@ -17,8 +17,9 @@
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "jni/MediaCodecBridge_jni.h"
+#include "media/base/android/media_codec_util.h"
#include "media/base/bit_reader.h"
-#include "media/base/decrypt_config.h"
+#include "media/base/subsample_entry.h"
using base::android::AttachCurrentThread;
using base::android::ConvertJavaStringToUTF8;

Powered by Google App Engine
This is Rietveld 408576698