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

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: rebase Created 6 years, 1 month 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_bridge_unittest.cc » ('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 27d931e36c94a3b77845b118aef180de4acf1150..ee847b7c24c638f949acc60fdb28e14dfbb15a2a 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -266,8 +266,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() {
@@ -449,11 +448,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());
@@ -465,11 +459,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) {
« no previous file with comments | « media/base/android/media_codec_bridge.h ('k') | media/base/android/media_codec_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698