Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76d1aa08 authored by Venkatarama Avadhani's avatar Venkatarama Avadhani Committed by Venkatarama Avadhani (xWF)
Browse files

Clean up mediametadataretriever_default_rgba8888 flag 

Bug: 298965955
Bug: 409609831
Flag: EXEMPT removing com.android.media.playback.flags.mediametadataretriever_default_rgba8888
Test: atest com.android.mediaframeworktest.unit.MediaMetadataRetrieverTest
Change-Id: Ibdbf377099bb004feb5442b487494a90f054e9ef
parent a0ed7d03

AconfigFlags.bp

+0 −19
Original line number Diff line number Diff line
@@ -1292,25 +1292,6 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media

aconfig_declarations {

    name: "android.media.playback.flags-aconfig",

    package: "com.android.media.playback.flags",

    container: "system",

    srcs: ["media/jni/playback_flags.aconfig"],

}



cc_aconfig_library {

    name: "android.media.playback.flags-aconfig-cc",

    aconfig_declarations: "android.media.playback.flags-aconfig",

}



java_aconfig_library {

    name: "android.media.playback.flags-aconfig-java",

    aconfig_declarations: "android.media.playback.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// DevicePolicy

aconfig_declarations {

    name: "device_policy_aconfig_flags",

media/jni/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ cc_library_shared { 
        "libstagefright_foundation",

        "libui",

        "libutils",

        "server_configurable_flags",

    ],



    header_libs: [
@@ -113,7 +112,6 @@ cc_library_shared { 
    static_libs: [

        "android.companion.virtualdevice.flags-aconfig-cc",

        "android.media.codec-aconfig-cc",

        "android.media.playback.flags-aconfig-cc",

        "libgrallocusage",

        "libmedia_midiiowrapper",

    ],

media/jni/android_media_MediaMetadataRetriever.cpp

+3 −10
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ 
#include "android_media_MediaDataSource.h"

#include "android_media_Streams.h"

#include "android_util_Binder.h"

#include <com_android_media_playback_flags.h>



namespace playback_flags = com::android::media::playback::flags;

using namespace android;



struct fields_t {
@@ -343,10 +341,9 @@ static jobject getBitmapFromVideoFrame( 
    return jBitmap;

}



static AndroidBitmapFormat getColorFormat(JNIEnv *env, jobject options,

        AndroidBitmapFormat defaultPreferred = ANDROID_BITMAP_FORMAT_RGBA_8888) {

static AndroidBitmapFormat getColorFormat(JNIEnv *env, jobject options) {

    if (options == NULL) {

        return defaultPreferred;

        return ANDROID_BITMAP_FORMAT_RGBA_8888;

    }



    ScopedLocalRef<jobject> inConfig(env, env->GetObjectField(options, fields.inPreferredConfig));
@@ -377,11 +374,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime( 
        return NULL;

    }



    AndroidBitmapFormat defaultColorFormat =

            playback_flags::mediametadataretriever_default_rgba8888()

            ? ANDROID_BITMAP_FORMAT_RGBA_8888

            : ANDROID_BITMAP_FORMAT_RGB_565;

    AndroidBitmapFormat colorFormat = getColorFormat(env, params, defaultColorFormat);

    AndroidBitmapFormat colorFormat = getColorFormat(env, params);



    // Call native method to retrieve a video frame

    VideoFrame *videoFrame = NULL;

media/jni/playback_flags.aconfig

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
package: "com.android.media.playback.flags"

container: "system"



flag {

  name: "mediametadataretriever_default_rgba8888"

  namespace: "media_solutions"

  description: "Change MediaMetadataRetriever to use RGBA8888 for bitmap handling by default."

  bug: "298965955"

}

media/tests/MediaFrameworkTest/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ android_test { 
        "androidx.test.ext.junit",

        "androidx.test.rules",

        "android-ex-camera2",

        "android.media.playback.flags-aconfig-java",

        "flag-junit",

        "testng",

        "truth",

        "collector-device-lib-platform",