Commit 07b19e4b authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

minor improvements and simplifications

parent 4f27b5b2

ivas_processing_scripts/audiotools/wrappers/reverb.py

+6 −37
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ def reverb_hoa2( 
    # convert to float32

    hoa2_IR.audio = np.float32(hoa2_IR.audio)



    numchannels = 9  # HOA2 by definition

    numchannels = hoa2_IR.num_channels



    # calculate the scaling (multiplicative) factor such that the maximum gain of the IR filter across all frequencies is 0dB

    if align is None:
@@ -298,26 +298,14 @@ def reverb_hoa2( 
    ych = []

    for i in range(numchannels):

        # separate IR into each channel

        IR.audio = np.reshape(hoa2_IR.audio[:, i], (-1, 1))

        IR.audio = hoa2_IR.audio[:, [i]]

        # convolve mono input with channel IR

        ych.append(reverb(input, IR, align=align))



    # combine into HOA2 output

    y = audio.fromtype("HOA2")

    y.fs = input.fs

    y.audio = np.column_stack(

        [

            ych[0].audio,

            ych[1].audio,

            ych[2].audio,

            ych[3].audio,

            ych[4].audio,

            ych[5].audio,

            ych[6].audio,

            ych[7].audio,

            ych[8].audio,

        ]

    )

    y.audio = np.column_stack([ych[i].audio for i in range(numchannels)])



    return y
@@ -348,7 +336,7 @@ def reverb_hoa3( 
    # convert to float32

    hoa3_IR.audio = np.float32(hoa3_IR.audio)



    numchannels = 16  # HOA3 by definition

    numchannels = hoa3_IR.num_channels



    # calculate the scaling (multiplicative) factor such that the maximum gain of the IR filter across all frequencies is 0dB

    if align is None:
@@ -361,32 +349,13 @@ def reverb_hoa3( 
    ych = []

    for i in range(numchannels):

        # separate IR into each channel

        IR.audio = np.reshape(hoa3_IR.audio[:, i], (-1, 1))

        IR.audio = hoa3_IR.audio[:, [i]]

        # convolve mono input with channel IR

        ych.append(reverb(input, IR, align=align))



    # combine into HOA3 output

    y = audio.fromtype("HOA3")

    y.fs = input.fs

    y.audio = np.column_stack(

        [

            ych[0].audio,

            ych[1].audio,

            ych[2].audio,

            ych[3].audio,

            ych[4].audio,

            ych[5].audio,

            ych[6].audio,

            ych[7].audio,

            ych[8].audio,

            ych[9].audio,

            ych[10].audio,

            ych[11].audio,

            ych[12].audio,

            ych[13].audio,

            ych[14].audio,

            ych[15].audio,

        ]

    )

    y.audio = np.column_stack([ych[i].audio for i in range(numchannels)])



    return y