Commit 12d1ccf5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix passive stereo to mono downmix in renderer

parent a89e9d6e
Loading
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,12 @@ static ivas_error initMcPanGainsWithMonoOut(
            inputMc->panGains[i][0] = 1.f;
        }
    }
    else if ( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_STEREO )
    {
        /* Special case for STEREO to MONO: Passive downmix (L+R)/2 */
        inputMc->panGains[0][0] = 0.5;
        inputMc->panGains[1][0] = 0.5;
    }
    else
    {
        /* ls_conversion_cicpX_stereo contains gains for side speakers.
+25 −24
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ TEST_VECTOR_DIR = TESTS_DIR.joinpath("data")

OUTPUT_PATH_REF = TESTS_DIR.joinpath("ref")
OUTPUT_PATH_CUT = TESTS_DIR.joinpath("cut")
OUTPUT_PATH_REF = TESTS_DIR.joinpath("/home/amm-er/tmu/external_renderer/ref")
OUTPUT_PATH_CUT = TESTS_DIR.joinpath("/home/amm-er/tmu/external_renderer/cut")

CUSTOM_LAYOUT_DIR = SCRIPTS_DIR.joinpath("ls_layouts")
HR_TRAJECTORY_DIR = SCRIPTS_DIR.joinpath("trajectories")
@@ -541,37 +543,36 @@ pass_snr = {
    "test_multichannel_binaural_static_vs_decoder[7_1-BINAURAL]": 74,
    "test_multichannel_binaural_static_vs_decoder[7_1-BINAURAL_ROOM]": 19,
    "test_multichannel_binaural_static_vs_decoder[7_1_4-BINAURAL_ROOM]": 18,
    # Failure reason: R channel in MONO output is delayed
    "test_multichannel_vs_decoder[5_1_2-MONO]": 1,
    "test_multichannel_vs_decoder[5_1_4-MONO]": 1,
    "test_multichannel_vs_decoder[5_1-MONO]": 1,
    "test_multichannel_vs_decoder[7_1_4-MONO]": 1,
    "test_multichannel_vs_decoder[7_1-MONO]": 1,
    "test_multichannel_vs_decoder[STEREO-MONO]": 17,
    # Failure reason: Active dmx (decoder) vs Passive dmx (renderer)
    "test_multichannel_vs_decoder[5_1_2-STEREO]": 44,
    "test_multichannel_vs_decoder[5_1_4-STEREO]": 48,
    "test_multichannel_vs_decoder[5_1-5_1_2]": 62,
    "test_multichannel_vs_decoder[5_1-5_1_4]": 62,
    "test_multichannel_vs_decoder[5_1-7_1]": 62,
    "test_multichannel_vs_decoder[5_1-7_1_4]": 62,
    "test_multichannel_vs_decoder[5_1-MONO]": 43,
    "test_multichannel_vs_decoder[5_1-STEREO]": 48,
    "test_multichannel_vs_decoder[7_1_4-STEREO]": 46,
    "test_multichannel_vs_decoder[7_1-STEREO]": 44,
    "test_multichannel_vs_decoder[5_1_2-5_1_4]": 63,
    "test_multichannel_vs_decoder[5_1_2-5_1]": 63,
    "test_multichannel_vs_decoder[5_1_2-7_1_4]": 63,
    "test_multichannel_vs_decoder[5_1_2-5_1_4]": 63,
    "test_multichannel_vs_decoder[5_1_2-7_1]": 63,
    "test_multichannel_vs_decoder[5_1_4-5_1_2]": 63,
    "test_multichannel_vs_decoder[5_1_2-7_1_4]": 63,
    "test_multichannel_vs_decoder[5_1_2-MONO]": 38,
    "test_multichannel_vs_decoder[5_1_2-STEREO]": 44,
    "test_multichannel_vs_decoder[5_1_4-5_1]": 62,
    "test_multichannel_vs_decoder[5_1_4-7_1_4]": 61,
    "test_multichannel_vs_decoder[5_1_4-5_1_2]": 63,
    "test_multichannel_vs_decoder[5_1_4-7_1]": 62,
    "test_multichannel_vs_decoder[5_1-5_1_2]": 62,
    "test_multichannel_vs_decoder[5_1-5_1_4]": 62,
    "test_multichannel_vs_decoder[5_1-7_1_4]": 62,
    "test_multichannel_vs_decoder[5_1-7_1]": 62,
    "test_multichannel_vs_decoder[7_1_4-5_1_2]": 63,
    "test_multichannel_vs_decoder[7_1_4-5_1_4]": 63,
    "test_multichannel_vs_decoder[7_1_4-5_1]": 62,
    "test_multichannel_vs_decoder[7_1_4-7_1]": 62,
    "test_multichannel_vs_decoder[5_1_4-7_1_4]": 61,
    "test_multichannel_vs_decoder[5_1_4-MONO]": 42,
    "test_multichannel_vs_decoder[5_1_4-STEREO]": 48,
    "test_multichannel_vs_decoder[7_1-5_1]": 63,
    "test_multichannel_vs_decoder[7_1-5_1_2]": 63,
    "test_multichannel_vs_decoder[7_1-5_1_4]": 63,
    "test_multichannel_vs_decoder[7_1-5_1]": 63,
    "test_multichannel_vs_decoder[7_1-7_1_4]": 63,
    "test_multichannel_vs_decoder[7_1-MONO]": 38,
    "test_multichannel_vs_decoder[7_1-STEREO]": 44,
    "test_multichannel_vs_decoder[7_1_4-5_1]": 62,
    "test_multichannel_vs_decoder[7_1_4-5_1_2]": 63,
    "test_multichannel_vs_decoder[7_1_4-5_1_4]": 63,
    "test_multichannel_vs_decoder[7_1_4-7_1]": 62,
    "test_multichannel_vs_decoder[7_1_4-MONO]": 41,
    "test_multichannel_vs_decoder[7_1_4-STEREO]": 46,
    "test_multichannel_vs_decoder[STEREO-MONO]": 17,
}