Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ibd8ce581,I04cc955d into rvc-dev am: 0081f25310

Browse Source 
Change-Id: If6056da85bf419338c75b1782d8a2e45ac22a883
This commit is contained in:
Wonsik Kim
2020-04-10 16:19:30 +00:00
committed by Automerger Merge Worker
parent 5d570d3943 0081f25310
commit b4dfa05d2b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/android_media_MediaCodec.cpp
View File

@@ -676,8 +676,6 @@ status_t JMediaCodec::getOutputFrame(
if (buffer->size() > 0) { if (buffer->size() > 0) {
std::shared_ptr<C2Buffer> c2Buffer = buffer->asC2Buffer(); std::shared_ptr<C2Buffer> c2Buffer = buffer->asC2Buffer();
if (c2Buffer) { if (c2Buffer) {
// asC2Buffer clears internal reference, so set the reference again.
buffer->copy(c2Buffer);
switch (c2Buffer->data().type()) { switch (c2Buffer->data().type()) {
case C2BufferData::LINEAR: { case C2BufferData::LINEAR: {
std::unique_ptr<JMediaCodecLinearBlock> context{new JMediaCodecLinearBlock}; std::unique_ptr<JMediaCodecLinearBlock> context{new JMediaCodecLinearBlock};
@@ -2526,7 +2524,7 @@ static void android_media_MediaCodec_setAudioPresentation(
codec->selectAudioPresentation((int32_t)presentationId, (int32_t)programId); 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( ScopedLocalRef<jclass> clazz(
env, env->FindClass("android/media/MediaCodec")); env, env->FindClass("android/media/MediaCodec"));
CHECK(clazz.get() != NULL); CHECK(clazz.get() != NULL);
@@ -2983,7 +2981,7 @@ static void android_media_MediaCodec_LinearBlock_native_obtain(
} }
static jboolean android_media_MediaCodec_LinearBlock_checkCompatible( static jboolean android_media_MediaCodec_LinearBlock_checkCompatible(
JNIEnv *env, jobjectArray codecNames) { JNIEnv *env, jclass, jobjectArray codecNames) {
std::vector<std::string> names; std::vector<std::string> names;
PopulateNamesVector(env, codecNames, &names); PopulateNamesVector(env, codecNames, &names);
bool isCompatible = false; bool isCompatible = false;