From ad4cd5c0102094095f2c7a4622c80a659caacda1 Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Tue, 31 Mar 2020 22:31:44 -0700
Subject: media: fix MediaCodec JNI method signatures

Bug: 152617893
Bug: 152617368
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: I04cc955df4f27da0c5f8abe18efc6f2a8aa9a065
---
 media/jni/android_media_MediaCodec.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index fc9b91c76a4f..a5a8445ea5f6 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2526,7 +2526,7 @@ static void android_media_MediaCodec_setAudioPresentation(
     codec->selectAudioPresentation((int32_t)presentationId, (int32_t)programId);
 }
 
-static void android_media_MediaCodec_native_init(JNIEnv *env) {
+static void android_media_MediaCodec_native_init(JNIEnv *env, jclass) {
     ScopedLocalRef<jclass> clazz(
             env, env->FindClass("android/media/MediaCodec"));
     CHECK(clazz.get() != NULL);
@@ -2983,7 +2983,7 @@ static void android_media_MediaCodec_LinearBlock_native_obtain(
 }
 
 static jboolean android_media_MediaCodec_LinearBlock_checkCompatible(
-        JNIEnv *env, jobjectArray codecNames) {
+        JNIEnv *env, jclass, jobjectArray codecNames) {
     std::vector<std::string> names;
     PopulateNamesVector(env, codecNames, &names);
     bool isCompatible = false;
-- 
cgit v1.2.3-59-g8ed1b


From 3786f0c3e2ee89d2b7ec64b93e0ae13737d29590 Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Thu, 2 Apr 2020 11:29:23 -0700
Subject: media: change of asC2Buffer behavior

Bug: 152617675
Test: CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: Ibd8ce581c7a7e68c4abd06fa6884184cfaf7a5d6
---
 media/jni/android_media_MediaCodec.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index a5a8445ea5f6..a31f177d66ab 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -676,8 +676,6 @@ status_t JMediaCodec::getOutputFrame(
     if (buffer->size() > 0) {
         std::shared_ptr<C2Buffer> c2Buffer = buffer->asC2Buffer();
         if (c2Buffer) {
-            // asC2Buffer clears internal reference, so set the reference again.
-            buffer->copy(c2Buffer);
             switch (c2Buffer->data().type()) {
                 case C2BufferData::LINEAR: {
                     std::unique_ptr<JMediaCodecLinearBlock> context{new JMediaCodecLinearBlock};
-- 
cgit v1.2.3-59-g8ed1b