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

Commit 7c9123d1 authored by Guang Zhu's avatar Guang Zhu Committed by Android (Google) Code Review
Browse files

Merge "Revert "NdkMediaExtractor: per-sample format metadata API""

parents baea5247 a1d39ba7

media/extractors/mpeg2/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ cc_library_shared { 
        "libhidlbase",

        "liblog",

        "libmediaextractor",

        "libmediandk",

        "libstagefright_foundation",

        "libutils",

    ],

media/libmedia/NdkWrapper.cpp

+0 −13
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ static const char *AMediaFormatKeyGroupFloatInt32[] = { 
static status_t translateErrorCode(media_status_t err) {

    if (err == AMEDIA_OK) {

        return OK;

    } else if (err == AMEDIA_ERROR_END_OF_STREAM) {

        return ERROR_END_OF_STREAM;

    } else if (err == AMEDIA_ERROR_IO) {

        return ERROR_IO;

    } else if (err == AMEDIACODEC_INFO_TRY_AGAIN_LATER) {

        return -EAGAIN;

    }
@@ -1154,15 +1150,6 @@ int64_t AMediaExtractorWrapper::getSampleTime() { 
    return AMediaExtractor_getSampleTime(mAMediaExtractor);

}



status_t AMediaExtractorWrapper::getSampleFormat(sp<AMediaFormatWrapper> &formatWrapper) {

    if (mAMediaExtractor == NULL) {

        return DEAD_OBJECT;

    }

    AMediaFormat *format = AMediaFormat_new();

    formatWrapper = new AMediaFormatWrapper(format);

    return translateErrorCode(AMediaExtractor_getSampleFormat(mAMediaExtractor, format));

}



int64_t AMediaExtractorWrapper::getCachedDuration() {

    if (mAMediaExtractor == NULL) {

        return -1;

media/libmedia/include/media/NdkWrapper.h

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


    int64_t getSampleTime();



    status_t getSampleFormat(sp<AMediaFormatWrapper> &formatWrapper);



    int64_t getCachedDuration();



    bool advance();

media/libmediaplayer2/nuplayer2/GenericSource2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ sp<ABuffer> NuPlayer2::GenericSource2::mediaBufferToABuffer( 
    }



    if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) {

        meta->setInt32(AMEDIAFORMAT_KEY_TRACK_INDEX, mSubtitleTrack.mIndex);

        meta->setInt32("trackIndex", mSubtitleTrack.mIndex);

    }



    uint32_t dataType; // unused
@@ -1255,7 +1255,7 @@ sp<ABuffer> NuPlayer2::GenericSource2::mediaBufferToABuffer( 
    if (mb->meta_data().findData(

            kKeyMpegUserData, &dataType, &mpegUserDataPointer, &mpegUserDataLength)) {

        sp<ABuffer> mpegUserData = ABuffer::CreateAsCopy(mpegUserDataPointer, mpegUserDataLength);

        meta->setBuffer(AMEDIAFORMAT_KEY_MPEG_USER_DATA, mpegUserData);

        meta->setBuffer("mpegUserData", mpegUserData);

    }



    mb->release();

media/libmediaplayer2/nuplayer2/NuPlayer2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2842,7 +2842,7 @@ void NuPlayer2::onClosedCaptionNotify(const sp<AMessage> &msg) { 
void NuPlayer2::sendSubtitleData(const sp<ABuffer> &buffer, int32_t baseIndex) {

    int32_t trackIndex;

    int64_t timeUs, durationUs;

    CHECK(buffer->meta()->findInt32(AMEDIAFORMAT_KEY_TRACK_INDEX, &trackIndex));

    CHECK(buffer->meta()->findInt32("trackIndex", &trackIndex));

    CHECK(buffer->meta()->findInt64("timeUs", &timeUs));

    CHECK(buffer->meta()->findInt64("durationUs", &durationUs));