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

Commit 33680129 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Remove "mediafilter" renderscript test binary. 

This hasn't been meaningfully touched since 2014, appears to have only
ever been a kind of test binary, and isn't shipped on the device.

As part of the work to move beyond renderscript deprecation (a couple of
years ago) to renderscript removal, remove this rather than port it to
C++.

Bug: http://b/256932140
Test: treehugger
Change-Id: Ia56d55e110ebd185f6bfb0014fef77dfcc8d58fa
Merged-In: Ia56d55e110ebd185f6bfb0014fef77dfcc8d58fa
parent 22820be5

cmds/stagefright/Android.bp

+0 −40
Original line number Diff line number Diff line
@@ -210,46 +210,6 @@ cc_binary { 
    ],

}



cc_binary {

    name: "mediafilter",



    srcs: [

        "filters/argbtorgba.rscript",

        "filters/nightvision.rscript",

        "filters/saturation.rscript",

        "mediafilter.cpp",

    ],



    header_libs: [

        "libmediadrm_headers",

        "libmediametrics_headers",

        "libstagefright_headers",

        "rs-headers",

    ],



    shared_libs: [

        "libstagefright",

        "liblog",

        "libutils",

        "libbinder",

        "libstagefright_foundation",

        "libmedia_omx",

        "libui",

        "libgui",

        "libRScpp",

    ],



    static_libs: ["libstagefright_mediafilter"],



    cflags: [

        "-Wno-multichar",

    ],



    sanitize: {

        cfi: true,

    },

}



cc_binary {

    name: "muxer",

cmds/stagefright/filters/argbtorgba.rscript

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma version(1)

#pragma rs java_package_name(com.android.rs.cppbasic)

#pragma rs_fp_relaxed



void root(const uchar4 *v_in, uchar4 *v_out) {

    v_out->x = v_in->y;

    v_out->y = v_in->z;

    v_out->z = v_in->w;

    v_out->w = v_in->x;

}
 
 No newline at end of file

cmds/stagefright/filters/nightvision.rscript

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma version(1)

#pragma rs java_package_name(com.android.rs.cppbasic)

#pragma rs_fp_relaxed



const static float3 gMonoMult = {0.299f, 0.587f, 0.114f};

const static float3 gNightVisionMult = {0.5f, 1.f, 0.5f};



// calculates luminance of pixel, then biases color balance toward green

void root(const uchar4 *v_in, uchar4 *v_out) {

    v_out->x = v_in->x; // don't modify A



    // get RGB, scale 0-255 uchar to 0-1.0 float

    float3 rgb = {v_in->y * 0.003921569f, v_in->z * 0.003921569f,

            v_in->w * 0.003921569f};



    // apply filter

    float3 result = dot(rgb, gMonoMult) * gNightVisionMult;



    v_out->y = (uchar)clamp((result.r * 255.f + 0.5f), 0.f, 255.f);

    v_out->z = (uchar)clamp((result.g * 255.f + 0.5f), 0.f, 255.f);

    v_out->w = (uchar)clamp((result.b * 255.f + 0.5f), 0.f, 255.f);

}

cmds/stagefright/filters/saturation.rscript

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma version(1)

#pragma rs java_package_name(com.android.rs.cppbasic)

#pragma rs_fp_relaxed



const static float3 gMonoMult = {0.299f, 0.587f, 0.114f};



// global variables (parameters accessible to application code)

float gSaturation = 1.0f;



void root(const uchar4 *v_in, uchar4 *v_out) {

    v_out->x = v_in->x; // don't modify A



    // get RGB, scale 0-255 uchar to 0-1.0 float

    float3 rgb = {v_in->y * 0.003921569f, v_in->z * 0.003921569f,

            v_in->w * 0.003921569f};



    // apply saturation filter

    float3 result = dot(rgb, gMonoMult);

    result = mix(result, rgb, gSaturation);



    v_out->y = (uchar)clamp((result.r * 255.f + 0.5f), 0.f, 255.f);

    v_out->z = (uchar)clamp((result.g * 255.f + 0.5f), 0.f, 255.f);

    v_out->w = (uchar)clamp((result.b * 255.f + 0.5f), 0.f, 255.f);

}

cmds/stagefright/mediafilter.cpp

deleted100644 → 0
+0 −789

File deleted.

Preview size limit exceeded, changes collapsed.