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

Commit bef48edf authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge changes I70353a21,I1fd7d1d3,I6a9868fd 

am: cadb2e6a

Change-Id: Iff8acacf798c37bf519ae2cd797a3e74dc267ad7
parents 981c2e32 cadb2e6a

media/libmedia/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ cc_library { 
        "libmediaextractor",

        "libmediandk",

        "libnativewindow",

        "libstagefright",

        "libstagefright_foundation",

        "libui",

        "libutils",

media/libmedia/NdkWrapper.cpp

+12 −10
Original line number Diff line number Diff line
@@ -27,21 +27,23 @@ 
#include <media/NdkMediaFormat.h>

#include <media/NdkMediaExtractor.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/NuMediaExtractor.h>

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

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

#include <utils/Errors.h>

#include <utils/StrongPointer.h>



// TODO: remove forward declaration when AMediaExtractor_disconnect is offcially added to NDK



#ifdef __cplusplus

extern "C" {

#endif



media_status_t AMediaExtractor_disconnect(AMediaExtractor *);

// Temporarily keeping AMediaExtractor_disconnect() where it is used.

// Will be removed soon in favor of official public APIs.

struct AMediaExtractor {

    android::sp<android::NuMediaExtractor> mImpl;

    android::sp<android::ABuffer> mPsshBuf;

};



#ifdef __cplusplus

} // extern "C"

#endif

media_status_t AMediaExtractor_disconnect(AMediaExtractor * ex) {

    ex->mImpl->disconnect();

    return AMEDIA_OK;

}



namespace android {

media/ndk/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ cc_library_shared { 
    ],



    cflags: [

        "-fvisibility=hidden",

        "-DEXPORT=__attribute__((visibility(\"default\")))",



        "-Werror",
@@ -91,6 +90,11 @@ cc_library_shared { 
            enabled: false,

        },

    },

    version_script: "libmediandk.map.txt",

    stubs: {

        symbol_file: "libmediandk.map.txt",

        versions: ["29"],

    },

}



llndk_library {

media/ndk/NdkMediaExtractor.cpp

+0 −6
Original line number Diff line number Diff line
@@ -475,11 +475,5 @@ media_status_t AMediaExtractor_getSampleFormat(AMediaExtractor *ex, AMediaFormat 
    return AMEDIA_OK;

}



EXPORT

media_status_t AMediaExtractor_disconnect(AMediaExtractor * ex) {

    ex->mImpl->disconnect();

    return AMEDIA_OK;

}



} // extern "C"

media/ndk/include/media/NdkMediaCodec.h

+6 −6
Original line number Diff line number Diff line
@@ -240,12 +240,6 @@ ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *inf 
        int64_t timeoutUs) __INTRODUCED_IN(21);

AMediaFormat* AMediaCodec_getOutputFormat(AMediaCodec*) __INTRODUCED_IN(21);



/**

 * Get format of the buffer. The specified buffer index must have been previously obtained from

 * dequeueOutputBuffer.

 */

AMediaFormat* AMediaCodec_getBufferFormat(AMediaCodec*, size_t index) __INTRODUCED_IN(21);



/**

 * If you are done with a buffer, use this call to return the buffer to

 * the codec. If you previously specified a surface when configuring this
@@ -352,6 +346,12 @@ media_status_t AMediaCodec_signalEndOfInputStream(AMediaCodec *mData) __INTRODUC 


#if __ANDROID_API__ >= 28



/**

 * Get format of the buffer. The specified buffer index must have been previously obtained from

 * dequeueOutputBuffer.

 */

AMediaFormat* AMediaCodec_getBufferFormat(AMediaCodec*, size_t index) __INTRODUCED_IN(28);



/**

 * Get the component name. If the codec was created by createDecoderByType

 * or createEncoderByType, what component is chosen is not known beforehand.