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

Commit 60e5a256 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "transcoding: move transcoding service to apex"

parents 9c7bdc21 a2e3a048

apex/Android.bp

+14 −4
Original line number Diff line number Diff line
@@ -32,15 +32,21 @@ apex_defaults { 
                "liboggextractor",

                "libwavextractor",

            ],

            // Transcoding service only run with primary ABI.

            binaries: [

                "mediatranscoding",

            ],

        },

    },

    // JNI

    native_shared_libs: ["libmediaparser-jni"],

    compile_multilib: "both",

    prebuilts: [

        "mediaextractor.policy",

        "code_coverage.policy",

        "com.android.media-mediatranscoding.rc",

        "crash_dump.policy",

        "mediaextractor.policy",

        "media-linker-config",

    ],

    key: "com.android.media.key",

    certificate: ":com.android.media.certificate",
@@ -62,9 +68,6 @@ apex { 
    name: "com.android.media",

    manifest: "manifest.json",

    defaults: ["com.android.media-defaults"],

    prebuilts: [

        "media-linker-config",

    ],

}



linker_config {
@@ -116,6 +119,13 @@ apex_defaults { 
    min_sdk_version: "29",

}



prebuilt_etc {

    name: "com.android.media-mediatranscoding.rc",

    src: "mediatranscoding.rc",

    filename: "init.rc",

    installable: false,

}



prebuilt_etc {

    name: "com.android.media.swcodec-mediaswcodec.rc",

    src: "mediaswcodec.rc",

apex/manifest.json

+7 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 309999900

  "version": 309999900,

  "requireNativeLibs": [

    "libandroid.so",

    "libbinder_ndk.so",

    "libmediandk.so",

    ":sphal"

  ]

}

apex/mediatranscoding.rc

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# media.transcoding service is defined on com.android.media apex which goes back

# to API29, but we only want it started on API31+ devices. So we declare it as

# "disabled" and start it explicitly on boot.

service media.transcoding /apex/com.android.media/bin/mediatranscoding

    class main

    user media

    group media

    ioprio rt 4

    task_profiles ProcessCapacityHigh HighPerformance

    disabled

media/libmediatranscoding/Android.bp

+20 −1
Original line number Diff line number Diff line
@@ -44,6 +44,19 @@ aidl_interface { 
    {

        java: {

            enabled: true,

            apex_available: [

                "com.android.media",

                "test_com.android.media",

            ],

            min_sdk_version: "29",

        },

        ndk: {

            enabled: true,

            apex_available: [

                "com.android.media",

                "test_com.android.media",

            ],

            min_sdk_version: "29",

        },

    },

}
@@ -51,6 +64,12 @@ aidl_interface { 
cc_library {

    name: "libmediatranscoding",



    min_sdk_version: "29",

    apex_available: [

        "com.android.media",

        "test_com.android.media",

    ],



    srcs: [

        "TranscodingClientManager.cpp",

        "TranscodingSessionController.cpp",
@@ -60,7 +79,7 @@ cc_library { 
    ],



    shared_libs: [

        "libandroid",

        "libandroid#31",

        "libbinder_ndk",

        "libcutils",

        "liblog",

media/libmediatranscoding/include/media/TranscoderWrapper.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#ifndef ANDROID_TRANSCODER_WRAPPER_H

#define ANDROID_TRANSCODER_WRAPPER_H



#include <android-base/thread_annotations.h>

#include <media/NdkMediaError.h>

#include <media/TranscoderInterface.h>