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

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

Issue 669623004: Switch to Lollipop APIs for MediaCodec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove getInputBufferCount() call Created 6 years, 2 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/media_codec_bridge.cc
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
index eb30f28966196c7a15c7cc14b4468491f6fe450f..54ef46df0e00df15bbb265bd4389633eec03fde3 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -244,8 +244,7 @@ MediaCodecBridge::~MediaCodecBridge() {
bool MediaCodecBridge::StartInternal() {
JNIEnv* env = AttachCurrentThread();
- return Java_MediaCodecBridge_start(env, j_media_codec_.obj()) &&
- GetOutputBuffers();
+ return Java_MediaCodecBridge_start(env, j_media_codec_.obj());
}
MediaCodecStatus MediaCodecBridge::Reset() {
@@ -427,11 +426,6 @@ void MediaCodecBridge::ReleaseOutputBuffer(int index, bool render) {
env, j_media_codec_.obj(), index, render);
}
-int MediaCodecBridge::GetInputBuffersCount() {
- JNIEnv* env = AttachCurrentThread();
- return Java_MediaCodecBridge_getInputBuffersCount(env, j_media_codec_.obj());
-}
-
int MediaCodecBridge::GetOutputBuffersCount() {
JNIEnv* env = AttachCurrentThread();
return Java_MediaCodecBridge_getOutputBuffersCount(env, j_media_codec_.obj());
@@ -443,11 +437,6 @@ size_t MediaCodecBridge::GetOutputBuffersCapacity() {
j_media_codec_.obj());
}
-bool MediaCodecBridge::GetOutputBuffers() {
- JNIEnv* env = AttachCurrentThread();
- return Java_MediaCodecBridge_getOutputBuffers(env, j_media_codec_.obj());
-}
-
void MediaCodecBridge::GetInputBuffer(int input_buffer_index,
uint8** data,
size_t* capacity) {

Powered by Google App Engine
This is Rietveld 408576698