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

Commit 6d077bf3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I8e6aa7a1,Ie50784b5 

* changes:
  separate metadatautils from rest of stagefright
  Separate mainline-used ESDS from rest of libstagefright
parents ec5965ba 3865fd16

media/libmediaplayerservice/nuplayer/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ license { 
    ],

}



cc_library_headers {

    name: "libstagefright_nuplayer_headers",



    export_include_dirs: [

        "include",

    ],

}



cc_library_static {



    srcs: [
@@ -81,6 +89,7 @@ cc_library_static { 


    static_libs: [

        "libplayerservice_datasource",

        "libstagefright_esds",

        "libstagefright_timedtext",

    ],

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include <gui/Surface.h>





#include "ESDS.h"

#include <media/esds/ESDS.h>

#include <media/stagefright/Utils.h>



namespace android {

media/libstagefright/Android.bp

+4 −69
Original line number Diff line number Diff line
@@ -33,75 +33,6 @@ cc_library_headers { 
    },

}



cc_library_static {

    name: "libstagefright_esds",

    apex_available: [

        "//apex_available:platform",

        "com.android.media",

    ],

    min_sdk_version: "29",



    srcs: ["ESDS.cpp"],



    cflags: [

        "-Werror",

        "-Wall",

    ],

    sanitize: {

        misc_undefined: [

            "signed-integer-overflow",

        ],

        cfi: true,

    },

    shared_libs: [

        "libstagefright_foundation",

        "libutils"

    ],

    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },

}



cc_library_static {

    name: "libstagefright_metadatautils",

    apex_available: [

        "//apex_available:platform",

        "com.android.media",

    ],

    min_sdk_version: "29",



    srcs: ["MetaDataUtils.cpp"],



    cflags: [

        "-Werror",

        "-Wall",

    ],

    sanitize: {

        misc_undefined: [

            "signed-integer-overflow",

        ],

        cfi: true,

    },



    header_libs: [

        "libaudioclient_headers",

        "libstagefright_foundation_headers",

        "media_ndk_headers",

    ],



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },



    export_include_dirs: ["include"],

}



cc_library_shared {

    name: "libstagefright_codecbase",
@@ -166,6 +97,10 @@ cc_library_static { 
        "liblog",

    ],



    static_libs: [

        "libstagefright_esds",

    ],



    export_include_dirs: [

        "include",

    ],

media/libstagefright/MPEG2TSWriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <media/stagefright/MetaData.h>

#include <arpa/inet.h>



#include "include/ESDS.h"

#include <media/esds/ESDS.h>



namespace android {

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include <media/mediarecorder.h>

#include <cutils/properties.h>



#include "include/ESDS.h"

#include <media/esds/ESDS.h>

#include "include/HevcUtils.h"



#ifndef __predict_false