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

Commit a485208f authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: move getOMXChannelMapping to ACodec 

Bug: 17108024
Change-Id: I9b9f3adaf5d3c2aa41e9998cfe719b995e72b608
parent b586c8e6

include/media/stagefright/ACodec.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct ACodec : public AHierarchicalStateMachine, public CodecBase { 
            int width, int height, int rate, int bitrate,

            OMX_VIDEO_AVCPROFILETYPE profile = OMX_VIDEO_AVCProfileBaseline);



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



protected:

    virtual ~ACodec();

include/media/stagefright/OMXCodec.h

+0 −2
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ 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

+64 −0
Original line number Diff line number Diff line
@@ -6887,4 +6887,68 @@ void ACodec::FlushingState::changeStateIfWeOwnAllBuffers() { 
    }

}



// These are supposed be equivalent to the logic in

// "audio_channel_out_mask_from_count".

//static

status_t ACodec::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

media/libstagefright/OMXCodec.cpp

+1 −64
Original line number Diff line number Diff line
@@ -3226,7 +3226,7 @@ void OMXCodec::setRawAudioFormat( 
    pcmParams.nSamplingRate = sampleRate;

    pcmParams.ePCMMode = OMX_AUDIO_PCMModeLinear;



    CHECK_EQ(getOMXChannelMapping(

    CHECK_EQ(ACodec::getOMXChannelMapping(

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



    err = mOMX->setParameter(
@@ -4434,67 +4434,4 @@ status_t QueryCodecs( 
    return QueryCodecs(omx, mimeType, queryDecoders, false /*hwCodecOnly*/, results);

}



// 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