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

Commit 5dcd67b8 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Keeping AMediaExtractor_disconnect() where it is used. 

This private API will be replaced with public API soon.

Test: make checkbuild
Merged-In: I083b85c31e42f7ddd4b2da365557e3d9251f8777
Change-Id: I6a9868fd1cf73f578a15e86b43f5ef049babd9ad
parent c6b48fe6

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/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"