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

Commit 655e2cf0 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b201944383_0114" 

* changes:
  track mpeg2ts header layout changes
  Exporting headers for include_dirs->header_libs changes
parents 1bee279a 10f1351d

media/extractors/mpeg2/MPEG2PSExtractor.cpp

+2 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 


#include "MPEG2PSExtractor.h"



#include <AnotherPacketSource.h>

#include <ESQueue.h>



#include <media/stagefright/foundation/ABitReader.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -33,6 +30,8 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <mpeg2ts/AnotherPacketSource.h>

#include <mpeg2ts/ESQueue.h>

#include <utils/String8.h>



#include <inttypes.h>

media/extractors/mpeg2/MPEG2TSExtractor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <mpeg2ts/AnotherPacketSource.h>

#include <utils/String8.h>



#include <AnotherPacketSource.h>



#include <hidl/HybridInterface.h>

#include <android/hardware/cas/1.0/ICas.h>

media/extractors/mpeg2/include/MPEG2TSExtractor.h

+1 −2
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ 
#include <media/MediaExtractorPluginApi.h>

#include <media/MediaExtractorPluginHelper.h>

#include <media/stagefright/MetaDataBase.h>

#include <mpeg2ts/ATSParser.h>

#include <utils/threads.h>

#include <utils/KeyedVector.h>

#include <utils/Vector.h>



#include <ATSParser.h>



namespace android {



struct AMessage;

media/libstagefright/mpeg2ts/Android.bp

+18 −3
Original line number Diff line number Diff line
@@ -54,16 +54,21 @@ cc_defaults { 
        "libstagefright_foundation_headers",

    ],



    export_include_dirs: ["."],

    export_include_dirs: ["include"],



    local_include_dirs: ["include/mpeg2ts"],



    whole_static_libs: [

        "libstagefright_metadatautils",

    ],



    min_sdk_version: "29",

}



    host_supported: true,

cc_defaults {

    name: "libstagefright_mpeg2support_sdk_defaults",



    min_sdk_version: "29",

    host_supported: true,

    target: {

        darwin: {

            enabled: false,
@@ -71,10 +76,19 @@ cc_defaults { 
    },

}



cc_library_headers {

    name: "libstagefright_mpeg2support_headers",

    defaults: [

        "libstagefright_mpeg2support_sdk_defaults",

    ],

    export_include_dirs: ["include"],

}



cc_library_static {

    name: "libstagefright_mpeg2support",

    defaults: [

        "libstagefright_mpeg2support_defaults",

        "libstagefright_mpeg2support_sdk_defaults",

    ],

    cflags: [

        "-DENABLE_CRYPTO",
@@ -91,6 +105,7 @@ cc_library_static { 
    name: "libstagefright_mpeg2support_nocrypto",

    defaults: [

        "libstagefright_mpeg2support_defaults",

        "libstagefright_mpeg2support_sdk_defaults",

    ],

    apex_available: [

        "com.android.media",