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

Commit 2829edcc authored by aarti jadhav-gaikwad's avatar aarti jadhav-gaikwad Committed by Eric Laurent
Browse files

stagefright: Pass audio aac sub formats in offloadinfo 

Pass audio aac sub formats in offloadinfo according to
aac profile. Audio HAL can take decision about offload
using DSP capabilities

Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
parent 7bad7223

include/media/stagefright/Utils.h

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ AString MakeUserAgent(); 
// Convert a MIME type to a AudioSystem::audio_format

status_t mapMimeToAudioFormat(audio_format_t& format, const char* mime);



// Convert a aac profile to a AudioSystem::audio_format

void mapAACProfileToAudioFormat(audio_format_t& format, uint64_t eAacProfile);



// Send information from MetaData to the HAL via AudioSink

status_t sendMetaDataToHal(sp<MediaPlayerBase::AudioSink>& sink, const sp<MetaData>& meta);

media/libstagefright/AudioPlayer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <binder/IPCThreadState.h>

#include <media/AudioTrack.h>

#include <media/openmax/OMX_Audio.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/ALooper.h>

#include <media/stagefright/AudioPlayer.h>
@@ -141,6 +142,12 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) { 
        } else {

            ALOGV("Mime type \"%s\" mapped to audio_format 0x%x", mime, audioFormat);

        }



        int32_t aacaot = -1;

        if ((audioFormat == AUDIO_FORMAT_AAC) && format->findInt32(kKeyAACAOT, &aacaot)) {

            // Redefine AAC format corrosponding to aac profile

            mapAACProfileToAudioFormat(audioFormat,(OMX_AUDIO_AACPROFILETYPE) aacaot);

        }

    }



    int avgBitRate = -1;

media/libstagefright/Utils.cpp

+37 −7
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <arpa/inet.h>

#include <cutils/properties.h>

#include <media/openmax/OMX_Audio.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AMessage.h>
@@ -609,6 +610,39 @@ const struct mime_conv_t* p = &mimeLookup[0]; 
    return BAD_VALUE;

}



struct aac_format_conv_t {

    OMX_AUDIO_AACPROFILETYPE eAacProfileType;

    audio_format_t format;

};



static const struct aac_format_conv_t profileLookup[] = {

    { OMX_AUDIO_AACObjectMain,        AUDIO_FORMAT_AAC_MAIN},

    { OMX_AUDIO_AACObjectLC,          AUDIO_FORMAT_AAC_LC},

    { OMX_AUDIO_AACObjectSSR,         AUDIO_FORMAT_AAC_SSR},

    { OMX_AUDIO_AACObjectLTP,         AUDIO_FORMAT_AAC_LTP},

    { OMX_AUDIO_AACObjectHE,          AUDIO_FORMAT_AAC_HE_V1},

    { OMX_AUDIO_AACObjectScalable,    AUDIO_FORMAT_AAC_SCALABLE},

    { OMX_AUDIO_AACObjectERLC,        AUDIO_FORMAT_AAC_ERLC},

    { OMX_AUDIO_AACObjectLD,          AUDIO_FORMAT_AAC_LD},

    { OMX_AUDIO_AACObjectHE_PS,       AUDIO_FORMAT_AAC_HE_V2},

    { OMX_AUDIO_AACObjectELD,         AUDIO_FORMAT_AAC_ELD},

    { OMX_AUDIO_AACObjectNull,        AUDIO_FORMAT_AAC},

};



void mapAACProfileToAudioFormat( audio_format_t& format, uint64_t eAacProfile)

{

const struct aac_format_conv_t* p = &profileLookup[0];

    while (p->eAacProfileType != OMX_AUDIO_AACObjectNull) {

        if (eAacProfile == p->eAacProfileType) {

            format = p->format;

            return;

        }

        ++p;

    }

    format = AUDIO_FORMAT_AAC;

    return;

}



bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo,

                      bool isStreaming, audio_stream_type_t streamType)

{
@@ -634,15 +668,11 @@ bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo, 
        return false;

    }



    // check whether it is ELD/LD content -> no offloading

    // FIXME: this should depend on audio DSP capabilities. mapMimeToAudioFormat() should use the

    // metadata to refine the AAC format and the audio HAL should only list supported profiles.

    // Redefine aac format according to its profile

    // Offloading depends on audio DSP capabilities.

    int32_t aacaot = -1;

    if (meta->findInt32(kKeyAACAOT, &aacaot)) {

        if (aacaot == 23 || aacaot == 39 ) {

            ALOGV("track of type '%s' is ELD/LD content", mime);

            return false;

        }

        mapAACProfileToAudioFormat(info.format,(OMX_AUDIO_AACPROFILETYPE) aacaot);

    }



    int32_t srate = -1;

services/audioflinger/AudioFlinger.cpp

+16 −7
Original line number Diff line number Diff line
@@ -106,13 +106,19 @@ static const nsecs_t kMinGlobalEffectEnabletimeNs = seconds(7200); 
// ----------------------------------------------------------------------------



const char *formatToString(audio_format_t format) {

    switch (format & AUDIO_FORMAT_MAIN_MASK) {

    case AUDIO_FORMAT_PCM:

        switch (format) {

    case AUDIO_FORMAT_PCM_SUB_8_BIT: return "pcm8";

    case AUDIO_FORMAT_PCM_SUB_16_BIT: return "pcm16";

    case AUDIO_FORMAT_PCM_SUB_32_BIT: return "pcm32";

    case AUDIO_FORMAT_PCM_SUB_8_24_BIT: return "pcm8.24";

    case AUDIO_FORMAT_PCM_SUB_24_BIT_PACKED: return "pcm24";

    case AUDIO_FORMAT_PCM_SUB_FLOAT: return "pcmfloat";

        case AUDIO_FORMAT_PCM_16_BIT: return "pcm16";

        case AUDIO_FORMAT_PCM_8_BIT: return "pcm8";

        case AUDIO_FORMAT_PCM_32_BIT: return "pcm32";

        case AUDIO_FORMAT_PCM_8_24_BIT: return "pcm8.24";

        case AUDIO_FORMAT_PCM_FLOAT: return "pcmfloat";

        case AUDIO_FORMAT_PCM_24_BIT_PACKED: return "pcm24";

        default:

            break;

        }

        break;

    case AUDIO_FORMAT_MP3: return "mp3";

    case AUDIO_FORMAT_AMR_NB: return "amr-nb";

    case AUDIO_FORMAT_AMR_WB: return "amr-wb";
@@ -120,6 +126,9 @@ const char *formatToString(audio_format_t format) { 
    case AUDIO_FORMAT_HE_AAC_V1: return "he-aac-v1";

    case AUDIO_FORMAT_HE_AAC_V2: return "he-aac-v2";

    case AUDIO_FORMAT_VORBIS: return "vorbis";

    case AUDIO_FORMAT_OPUS: return "opus";

    case AUDIO_FORMAT_AC3: return "ac-3";

    case AUDIO_FORMAT_E_AC3: return "e-ac-3";

    default:

        break;

    }

services/audiopolicy/AudioPolicyManager.cpp

+10 −0
Original line number Diff line number Diff line
@@ -122,6 +122,16 @@ const StringToEnum sFormatNameToEnumTable[] = { 
    STRING_TO_ENUM(AUDIO_FORMAT_PCM_24_BIT_PACKED),

    STRING_TO_ENUM(AUDIO_FORMAT_MP3),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_MAIN),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_LC),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_SSR),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_LTP),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_HE_V1),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_SCALABLE),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_ERLC),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_LD),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_HE_V2),

    STRING_TO_ENUM(AUDIO_FORMAT_AAC_ELD),

    STRING_TO_ENUM(AUDIO_FORMAT_VORBIS),

    STRING_TO_ENUM(AUDIO_FORMAT_HE_AAC_V1),

    STRING_TO_ENUM(AUDIO_FORMAT_HE_AAC_V2),