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

Commit 0eb243f1 authored by mtwebster's avatar mtwebster
Browse files

Revert "Squashed commit of the following:" 

This reverts commit 16263d9f.

Removing this commit appears to fix web audio sync bug, along with
setting:

build/target/product/core.mk: media.stagefright.enable-http=false
parent dd699a2c

include/media/stagefright/AudioPlayer.h

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ private: 


    bool mStarted;



    bool mIsFirstBuffer;

    status_t mFirstBufferResult;

    MediaBuffer *mFirstBuffer;



    sp<MediaPlayerBase::AudioSink> mAudioSink;



    static void AudioCallback(int event, void *user, void *info);

media/libstagefright/AudioPlayer.cpp

+3 −63
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MetaData.h>
@@ -42,9 +41,6 @@ AudioPlayer::AudioPlayer(const sp<MediaPlayerBase::AudioSink> &audioSink) 
      mReachedEOS(false),

      mFinalStatus(OK),

      mStarted(false),

      mIsFirstBuffer(false),

      mFirstBufferResult(OK),

      mFirstBuffer(NULL),

      mAudioSink(audioSink) {

}
@@ -72,24 +68,6 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) { 
        }

    }



    // We allow an optional INFO_FORMAT_CHANGED at the very beginning

    // of playback, if there is one, getFormat below will retrieve the

    // updated format, if there isn't, we'll stash away the valid buffer

    // of data to be used on the first audio callback.



    CHECK(mFirstBuffer == NULL);



    mFirstBufferResult = mSource->read(&mFirstBuffer);

    if (mFirstBufferResult == INFO_FORMAT_CHANGED) {

        LOGV("INFO_FORMAT_CHANGED!!!");



        CHECK(mFirstBuffer == NULL);

        mFirstBufferResult = OK;

        mIsFirstBuffer = false;

    } else {

        mIsFirstBuffer = true;

    }



    sp<MetaData> format = mSource->getFormat();

    const char *mime;

    bool success = format->findCString(kKeyMIMEType, &mime);
@@ -109,14 +87,7 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) { 
                DEFAULT_AUDIOSINK_BUFFERCOUNT,

                &AudioPlayer::AudioSinkCallback, this);

        if (err != OK) {

            if (mFirstBuffer != NULL) {

                mFirstBuffer->release();

                mFirstBuffer = NULL;

            }



            if (!sourceAlreadyStarted) {

            mSource->stop();

            }



            return err;

        }
@@ -137,14 +108,7 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) { 
            delete mAudioTrack;

            mAudioTrack = NULL;



            if (mFirstBuffer != NULL) {

                mFirstBuffer->release();

                mFirstBuffer = NULL;

            }



            if (!sourceAlreadyStarted) {

            mSource->stop();

            }



            return err;

        }
@@ -195,12 +159,6 @@ void AudioPlayer::stop() { 


    // Make sure to release any buffer we hold onto so that the

    // source is able to stop().



    if (mFirstBuffer != NULL) {

        mFirstBuffer->release();

        mFirstBuffer = NULL;

    }



    if (mInputBuffer != NULL) {

        LOGV("AudioPlayer releasing input buffer.");
@@ -285,14 +243,6 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { 
            Mutex::Autolock autoLock(mLock);



            if (mSeeking) {

                if (mIsFirstBuffer) {

                    if (mFirstBuffer != NULL) {

                        mFirstBuffer->release();

                        mFirstBuffer = NULL;

                    }

                    mIsFirstBuffer = false;

                }



                options.setSeekTo(mSeekTimeUs);



                if (mInputBuffer != NULL) {
@@ -305,17 +255,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { 
        }



        if (mInputBuffer == NULL) {

            status_t err;



            if (mIsFirstBuffer) {

                mInputBuffer = mFirstBuffer;

                mFirstBuffer = NULL;

                err = mFirstBufferResult;



                mIsFirstBuffer = false;

            } else {

                err = mSource->read(&mInputBuffer, &options);

            }

            status_t err = mSource->read(&mInputBuffer, &options);



            CHECK((err == OK && mInputBuffer != NULL)

                   || (err != OK && mInputBuffer == NULL));

media/libstagefright/codecs/aacdec/AACDecoder.cpp

+45 −65
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include "AACDecoder.h"

#define LOG_TAG "AACDecoder"



#include "../../include/ESDS.h"
@@ -37,33 +36,26 @@ AACDecoder::AACDecoder(const sp<MediaSource> &source) 
      mAnchorTimeUs(0),

      mNumSamplesOutput(0),

      mInputBuffer(NULL) {

}



    sp<MetaData> srcFormat = mSource->getFormat();



    int32_t sampleRate;

    CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate));



    mMeta = new MetaData;

    mMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);



    // We'll always output stereo, regardless of how many channels are

    // present in the input due to decoder limitations.

    mMeta->setInt32(kKeyChannelCount, 2);

    mMeta->setInt32(kKeySampleRate, sampleRate);



    int64_t durationUs;

    if (srcFormat->findInt64(kKeyDuration, &durationUs)) {

        mMeta->setInt64(kKeyDuration, durationUs);

AACDecoder::~AACDecoder() {

    if (mStarted) {

        stop();

    }

    mMeta->setCString(kKeyDecoderComponent, "AACDecoder");



    mInitCheck = initCheck();

    delete mConfig;

    mConfig = NULL;

}



status_t AACDecoder::initCheck() {

    memset(mConfig, 0, sizeof(tPVMP4AudioDecoderExternal));

status_t AACDecoder::start(MetaData *params) {

    CHECK(!mStarted);



    mBufferGroup = new MediaBufferGroup;

    mBufferGroup->add_buffer(new MediaBuffer(2048 * 2));



    mConfig->outputFormat = OUTPUTFORMAT_16PCM_INTERLEAVED;

    mConfig->aacPlusEnabled = 1;

    mConfig->aacPlusUpsamplingFactor = 0;

    mConfig->aacPlusEnabled = false;



    // The software decoder doesn't properly support mono output on

    // AACplus files. Always output stereo.
@@ -72,11 +64,8 @@ status_t AACDecoder::initCheck() { 
    UInt32 memRequirements = PVMP4AudioDecoderGetMemRequirements();

    mDecoderBuf = malloc(memRequirements);



    status_t err = PVMP4AudioDecoderInitLibrary(mConfig, mDecoderBuf);

    if (err != MP4AUDEC_SUCCESS) {

        LOGE("Failed to initialize MP4 audio decoder");

        return UNKNOWN_ERROR;

    }

    CHECK_EQ(PVMP4AudioDecoderInitLibrary(mConfig, mDecoderBuf),

             MP4AUDEC_SUCCESS);



    uint32_t type;

    const void *data;
@@ -94,29 +83,18 @@ status_t AACDecoder::initCheck() { 
        mConfig->pInputBuffer = (UChar *)codec_specific_data;

        mConfig->inputBufferCurrentLength = codec_specific_data_size;

        mConfig->inputBufferMaxLength = 0;

        mConfig->inputBufferUsedLength = 0;

        mConfig->remainderBits = 0;



        mConfig->pOutputBuffer = NULL;

        mConfig->pOutputBuffer_plus = NULL;

        mConfig->repositionFlag = false;



        if (PVMP4AudioDecoderConfig(mConfig, mDecoderBuf)

                != MP4AUDEC_SUCCESS) {

            return ERROR_UNSUPPORTED;

        }

    }

    return OK;

}



AACDecoder::~AACDecoder() {

    if (mStarted) {

        stop();

    }



    delete mConfig;

    mConfig = NULL;

}



status_t AACDecoder::start(MetaData *params) {

    CHECK(!mStarted);



    mBufferGroup = new MediaBufferGroup;

    mBufferGroup->add_buffer(new MediaBuffer(4096 * 2));



    mSource->start();
@@ -149,7 +127,28 @@ status_t AACDecoder::stop() { 
}



sp<MetaData> AACDecoder::getFormat() {

    return mMeta;

    sp<MetaData> srcFormat = mSource->getFormat();



    int32_t sampleRate;

    CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate));



    sp<MetaData> meta = new MetaData;

    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);



    // We'll always output stereo, regardless of how many channels are

    // present in the input due to decoder limitations.

    meta->setInt32(kKeyChannelCount, 2);



    meta->setInt32(kKeySampleRate, sampleRate);



    int64_t durationUs;

    if (srcFormat->findInt64(kKeyDuration, &durationUs)) {

        meta->setInt64(kKeyDuration, durationUs);

    }



    meta->setCString(kKeyDecoderComponent, "AACDecoder");



    return meta;

}



status_t AACDecoder::read(
@@ -201,32 +200,13 @@ status_t AACDecoder::read( 
    mConfig->remainderBits = 0;



    mConfig->pOutputBuffer = static_cast<Int16 *>(buffer->data());

    mConfig->pOutputBuffer_plus = &mConfig->pOutputBuffer[2048];

    mConfig->pOutputBuffer_plus = NULL;

    mConfig->repositionFlag = false;



    Int decoderErr = PVMP4AudioDecodeFrame(mConfig, mDecoderBuf);



    // Check on the sampling rate to see whether it is changed.

    int32_t sampleRate;

    CHECK(mMeta->findInt32(kKeySampleRate, &sampleRate));

    if (mConfig->samplingRate != sampleRate) {

        mMeta->setInt32(kKeySampleRate, mConfig->samplingRate);

        LOGW("Sample rate was %d, but now is %d",

                sampleRate, mConfig->samplingRate);

        buffer->release();

        mInputBuffer->release();

        mInputBuffer = NULL;

        return INFO_FORMAT_CHANGED;

    }



    size_t numOutBytes =

        mConfig->frameLength * sizeof(int16_t) * mConfig->desiredChannels;

    if (mConfig->aacPlusUpsamplingFactor == 2) {

        if (mConfig->desiredChannels == 1) {

            memcpy(&mConfig->pOutputBuffer[1024], &mConfig->pOutputBuffer[2048], numOutBytes * 2);

        }

        numOutBytes *= 2;

    }



    if (decoderErr != MP4AUDEC_SUCCESS) {

        LOGW("AAC decoder returned error %d, substituting silence", decoderErr);

media/libstagefright/include/AACDecoder.h

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ struct tPVMP4AudioDecoderExternal; 
namespace android {



struct MediaBufferGroup;

struct MetaData;



struct AACDecoder : public MediaSource {

    AACDecoder(const sp<MediaSource> &source);
@@ -42,7 +41,6 @@ protected: 
    virtual ~AACDecoder();



private:

    sp<MetaData>    mMeta;

    sp<MediaSource> mSource;

    bool mStarted;
@@ -52,11 +50,9 @@ private: 
    void *mDecoderBuf;

    int64_t mAnchorTimeUs;

    int64_t mNumSamplesOutput;

    status_t mInitCheck;



    MediaBuffer *mInputBuffer;



    status_t initCheck();

    AACDecoder(const AACDecoder &);

    AACDecoder &operator=(const AACDecoder &);

};