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

Commit 9693a15c authored by Manish Dewangan's avatar Manish Dewangan Committed by Linux Build Service Account
Browse files

audio: Remove unused code related to NuPlayer pcm conversion 

-Remove Nuplayer pcm conversion changes as from N onwards pcm
 format conversion happens in ACodec and hence Nuplayer pcm
 conversion changes are not needed.

Change-Id: I198d0be5fe02ca2dbde2502713edf99b92ca1399
parent 41c76670

media/libavextensions/mediaplayerservice/AVNuExtensions.h

+0 −9
Original line number Diff line number Diff line
@@ -72,16 +72,7 @@ struct AVNuUtils { 
    virtual void checkFormatChange(bool *formatChange, const sp<ABuffer> &accessUnit);

    virtual void overWriteAudioOutputFormat(sp <AMessage> &dst, const sp <AMessage> &src);

    virtual bool pcmOffloadException(const sp<AMessage> &);

    virtual bool isRAWFormat(const sp<MetaData> &);

    virtual bool isRAWFormat(const sp<AMessage> &);

    virtual int updateAudioBitWidth(audio_format_t audioFormat,

            const sp<AMessage> &);

    virtual audio_format_t getKeyPCMFormat(const sp<MetaData> &);

    virtual void setKeyPCMFormat(const sp<MetaData> &, audio_format_t audioFormat);

    virtual audio_format_t getPCMFormat(const sp<AMessage> &);

    virtual void setPCMFormat(const sp<AMessage> &, audio_format_t audioFormat);

    virtual void setSourcePCMFormat(const sp<MetaData> &);

    virtual void setDecodedPCMFormat(const sp<AMessage> &);

    virtual void setCodecOutputFormat(const sp<AMessage> &);



    // ----- NO TRESSPASSING BEYOND THIS LINE ------

media/libavextensions/mediaplayerservice/AVNuUtils.cpp

+0 −33
Original line number Diff line number Diff line
@@ -60,43 +60,10 @@ bool AVNuUtils::pcmOffloadException(const sp<AMessage> &) { 
    return true;

}



bool AVNuUtils::isRAWFormat(const sp<MetaData> &) {

    return false;

}



bool AVNuUtils::isRAWFormat(const sp<AMessage> &) {

    return false;

}



int AVNuUtils::updateAudioBitWidth(audio_format_t /*audioFormat*/,

        const sp<AMessage> &){

    return 16;

}



audio_format_t AVNuUtils::getKeyPCMFormat(const sp<MetaData> &) {

    return AUDIO_FORMAT_INVALID;

}



void AVNuUtils::setKeyPCMFormat(const sp<MetaData> &, audio_format_t /*audioFormat*/) {



}



audio_format_t AVNuUtils::getPCMFormat(const sp<AMessage> &) {

    return AUDIO_FORMAT_PCM_16_BIT;

}



void AVNuUtils::setPCMFormat(const sp<AMessage> &, audio_format_t /*audioFormat*/) {



}



void AVNuUtils::setSourcePCMFormat(const sp<MetaData> &) {



}



void AVNuUtils::setDecodedPCMFormat(const sp<AMessage> &) {



}



void AVNuUtils::setCodecOutputFormat(const sp<AMessage> &) {



}

media/libavextensions/stagefright/AVExtensions.h

+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ struct AVUtils { 
            const sp<MetaData> &);

    virtual audio_format_t updateAudioFormat(audio_format_t audioFormat,

            const sp<AMessage> &);

    virtual void setPcmSampleBits(const sp<MetaData> &, int32_t /*bitWidth*/);

    virtual void setPcmSampleBits(const sp<AMessage> &, int32_t /*bitWidth*/);



    virtual bool canOffloadAPE(const sp<MetaData> &meta);

media/libavextensions/stagefright/AVUtils.cpp

+0 −7
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ status_t AVUtils::sendMetaDataToHal( 
    return OK;

}





int AVUtils::getAudioSampleBits(const sp<MetaData> &) {

    return 16;

}
@@ -78,12 +77,6 @@ audio_format_t AVUtils::updateAudioFormat(audio_format_t audioFormat, 
    return audioFormat;

}



void AVUtils::setPcmSampleBits(const sp<AMessage> &, int32_t /*bitWidth*/) {

}



void AVUtils::setPcmSampleBits(const sp<MetaData> &, int32_t /*bitWidth*/) {

}



static bool dumbSniffer(

        const sp<DataSource> &, String8 *,

        float *, sp<AMessage> *) {