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

Commit 60473580 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "NdkMediaExtractor: add disconnect API" into pi-dev 

am: dde4221a

Change-Id: I3745e8d245d56abce271f8d9c584130de3ddcc60
parents 96d84dba dde4221a

media/libmedia/NdkWrapper.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,14 @@ status_t AMediaExtractorWrapper::release() { 
    return OK;

}



status_t AMediaExtractorWrapper::disconnect() {

    if (mAMediaExtractor != NULL) {

        media_status_t err = AMediaExtractor_disconnect(mAMediaExtractor);

        return translateErrorCode(err);

    }

    return DEAD_OBJECT;

}



AMediaExtractor *AMediaExtractorWrapper::getAMediaExtractor() const {

    return mAMediaExtractor;

}

media/libmedia/include/media/NdkWrapper.h

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ struct AMediaExtractorWrapper : public RefBase { 


    status_t release();



    status_t disconnect();



    status_t setDataSource(int fd, off64_t offset, off64_t length);



    status_t setDataSource(const char *location);

media/libstagefright/NuMediaExtractor.cpp

+9 −0
Original line number Diff line number Diff line
@@ -205,6 +205,15 @@ status_t NuMediaExtractor::setMediaCas(const HInterfaceToken &casToken) { 
    return OK;

}



void NuMediaExtractor::disconnect() {

    if (mDataSource != NULL) {

        // disconnect data source

        if (mDataSource->flags() & DataSource::kIsCachingDataSource) {

            static_cast<NuCachedSource2 *>(mDataSource.get())->disconnect();

        }

    }

}



status_t NuMediaExtractor::updateDurationAndBitrate() {

    if (mImpl->countTracks() > kMaxTrackCount) {

        return ERROR_UNSUPPORTED;

media/libstagefright/include/media/stagefright/NuMediaExtractor.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ struct NuMediaExtractor : public RefBase { 


    status_t setMediaCas(const HInterfaceToken &casToken);



    void disconnect();



    size_t countTracks() const;

    status_t getTrackFormat(size_t index, sp<AMessage> *format, uint32_t flags = 0) const;

media/ndk/NdkMediaExtractor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -475,5 +475,11 @@ 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"