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

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

Issue 1918623002: Use the MediaCodec flush workaround in more cases (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/ndk_media_codec_bridge.cc
diff --git a/media/base/android/ndk_media_codec_bridge.cc b/media/base/android/ndk_media_codec_bridge.cc
index 3a66db675c96c1f21245b8b49a6dc47abe12baed..5a2f308cb271717c1ad7dae934a8255016266eb0 100644
--- a/media/base/android/ndk_media_codec_bridge.cc
+++ b/media/base/android/ndk_media_codec_bridge.cc
@@ -13,6 +13,7 @@
#include "base/logging.h"
#include "base/native_library.h"
#include "base/strings/string_util.h"
+#include "media/base/android/media_codec_util.h"
#include "media/base/decrypt_config.h"
namespace {
@@ -237,4 +238,11 @@ MediaCodecStatus NdkMediaCodecBridge::CopyFromOutputBuffer(int index,
return MEDIA_CODEC_OK;
}
+std::string NdkMediaCodecBridge::GetName() {
+ // The NDK doesn't expose a name getter, so use the default name as a proxy.
DaleCurtis 2016/04/23 19:06:21 I'm wary of this, there is already some worry that
+ if (base::android::BuildInfo::GetInstance()->sdk_int() < 18)
+ return "";
+ return MediaCodecUtil::GetDefaultCodecName(mime_, direction_);
+}
+
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698