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

Commit c1d8115e authored by Andreas Huber's avatar Andreas Huber
Browse files

Make sure OMXCodec and ACodec both accept more than 2 channels of audio 

and fill in the OMX channel mask properly.

Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
parent 1dc28b79

include/media/stagefright/OMXCodec.h

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <media/stagefright/MediaSource.h>

#include <utils/threads.h>



#include <OMX_Audio.h>



namespace android {



struct MediaCodecList;
@@ -390,6 +392,8 @@ status_t QueryCodec( 
        bool isEncoder,

        CodecCapabilities *caps);



status_t getOMXChannelMapping(size_t numChannels, OMX_AUDIO_CHANNELTYPE map[]);



}  // namespace android



#endif  // OMX_CODEC_H_

media/libstagefright/ACodec.cpp

+2 −7
Original line number Diff line number Diff line
@@ -1182,13 +1182,8 @@ status_t ACodec::setupRawAudioFormat( 
    pcmParams.nSamplingRate = sampleRate;

    pcmParams.ePCMMode = OMX_AUDIO_PCMModeLinear;



    if (numChannels == 1) {

        pcmParams.eChannelMapping[0] = OMX_AUDIO_ChannelCF;

    } else {

        CHECK_EQ(numChannels, 2);



        pcmParams.eChannelMapping[0] = OMX_AUDIO_ChannelLF;

        pcmParams.eChannelMapping[1] = OMX_AUDIO_ChannelRF;

    if (getOMXChannelMapping(numChannels, pcmParams.eChannelMapping) != OK) {

        return OMX_ErrorNone;

    }



    return mOMX->setParameter(

media/libstagefright/OMXCodec.cpp

+65 −8
Original line number Diff line number Diff line
@@ -3310,14 +3310,8 @@ void OMXCodec::setRawAudioFormat( 
    pcmParams.nSamplingRate = sampleRate;

    pcmParams.ePCMMode = OMX_AUDIO_PCMModeLinear;



    if (numChannels == 1) {

        pcmParams.eChannelMapping[0] = OMX_AUDIO_ChannelCF;

    } else {

        CHECK_EQ(numChannels, 2);



        pcmParams.eChannelMapping[0] = OMX_AUDIO_ChannelLF;

        pcmParams.eChannelMapping[1] = OMX_AUDIO_ChannelRF;

    }

    CHECK_EQ(getOMXChannelMapping(

                numChannels, pcmParams.eChannelMapping), (status_t)OK);



    err = mOMX->setParameter(

            mNode, OMX_IndexParamAudioPcm, &pcmParams, sizeof(pcmParams));
@@ -4602,4 +4596,67 @@ void OMXCodec::restorePatchedDataPointer(BufferInfo *info) { 
    header->pBuffer = (OMX_U8 *)info->mData;

}



// These are supposed be equivalent to the logic in

// "audio_channel_out_mask_from_count".

status_t getOMXChannelMapping(size_t numChannels, OMX_AUDIO_CHANNELTYPE map[]) {

    switch (numChannels) {

        case 1:

            map[0] = OMX_AUDIO_ChannelCF;

            break;

        case 2:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            break;

        case 3:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            map[2] = OMX_AUDIO_ChannelCF;

            break;

        case 4:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            map[2] = OMX_AUDIO_ChannelLR;

            map[3] = OMX_AUDIO_ChannelRR;

            break;

        case 5:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            map[2] = OMX_AUDIO_ChannelCF;

            map[3] = OMX_AUDIO_ChannelLR;

            map[4] = OMX_AUDIO_ChannelRR;

            break;

        case 6:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            map[2] = OMX_AUDIO_ChannelCF;

            map[3] = OMX_AUDIO_ChannelLFE;

            map[4] = OMX_AUDIO_ChannelLR;

            map[5] = OMX_AUDIO_ChannelRR;

            break;

        case 7:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            map[2] = OMX_AUDIO_ChannelCF;

            map[3] = OMX_AUDIO_ChannelLFE;

            map[4] = OMX_AUDIO_ChannelLR;

            map[5] = OMX_AUDIO_ChannelRR;

            map[6] = OMX_AUDIO_ChannelCS;

            break;

        case 8:

            map[0] = OMX_AUDIO_ChannelLF;

            map[1] = OMX_AUDIO_ChannelRF;

            map[2] = OMX_AUDIO_ChannelCF;

            map[3] = OMX_AUDIO_ChannelLFE;

            map[4] = OMX_AUDIO_ChannelLR;

            map[5] = OMX_AUDIO_ChannelRR;

            map[6] = OMX_AUDIO_ChannelLS;

            map[7] = OMX_AUDIO_ChannelRS;

            break;

        default:

            return -EINVAL;

    }



    return OK;

}



}  // namespace android