diff --git a/lib_com/options.h b/lib_com/options.h old mode 100644 new mode 100755 index 1038a3c7ff1a012540fa7c7407b7d07fa8c53435..11fd17c3f31c0074c62f0019f6badaac4ef50e9a --- a/lib_com/options.h +++ b/lib_com/options.h @@ -202,7 +202,8 @@ #define FIX_1330_JBM_MEMORY_FIX /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */ #define NONBE_1380_OMASA_BUILD_DIFF /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */ #define NONBE_FIX_1426_STEREO_PANNING_BETWEEN_OPT_LEVEL /* Nokia: Adjustments in remaining stereo panning functions to make them BE between Debug and Release */ -#define FIX_GAIN_EDIT_LIMITS /* Harmonize gain edit limits for all opertation points. For all modes, limit to max +12dB. For parametric modes, limit to min -24dB. */ +#define FIX_GAIN_EDIT_LIMITS /* Harmonize gain edit limits for all opertation points. For all modes, limit to max +12dB. For parametric modes, limit to min -24dB. */ +#define BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL /* Dolby: Fix coverage of SBA SPAR Dynamic active W not getting hit by the tests */ #define FIX_1430_EVS_STEREO_DMX_CHANNEL_DISAPPEARING /* Orange: Fix for basop issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */ diff --git a/lib_debug/debug.c b/lib_debug/debug.c index 012183c5ac9e392b1114723e5a698c8df7a87118..6ea62a4a46cf3d8cdfc5b71081b1df27b597e1a7 100644 --- a/lib_debug/debug.c +++ b/lib_debug/debug.c @@ -774,8 +774,13 @@ char *fname( { char idd[6]; +#ifdef BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL + assert( id >= 0 && id < 100 ); + snprintf( idd, sizeof( idd ), ".id%d", id ); +#else assert( id < 100 ); sprintf( idd, ".id%d", id ); +#endif strcpy( tmp_fname, dir ); strcat( tmp_fname, file ); diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index 79b00113fcc57bcd55e3951aac232820daa1e3bf..0cb0cf6e60517e3e6c89b1245607ed4de4472d42 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -838,7 +838,11 @@ static ivas_error ivas_spar_enc_process( { /*cross fade between new active W channels and old passive W channel*/ +#ifdef BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL + if ( dyn_active_w_flag == 1 || hSpar->hMdEnc->spar_md.prior_dyn_active_w_flag == 1 ) +#else if ( dyn_active_w_flag == 1 ) +#endif { if ( hSpar->hMdEnc->spar_md.prior_dyn_active_w_flag != dyn_active_w_flag ) { diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index af39f6b5c2de81efd1e6ba10ecca3109ceac8960..588495b7838d53f9d07a9932606153f8c786be92 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -738,6 +738,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -dtx -sba 1 64000 48 testv/stvFOA48n.wav bit ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stvFOA48n.wav_SBA_64000_48-48_DTX_BINAURAL_ROOM.tst +// SBA at 64 kpbs, 48kHz in, 48kHz out, EXT out +../IVAS_cod -sba 1 64000 48 testv/stvFOA48c_cut.wav bit +../IVAS_dec EXT 48 bit testv/stvFOA48c_cut.wav_SBA_64000_48-48_EXT.tst + // SBA at 80 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_HOA3.tst diff --git a/scripts/testv/stvFOA48c_cut.wav b/scripts/testv/stvFOA48c_cut.wav index 7f3c6231ec70202b3d35aba5d24471ac221ae324..98fecdbf5f6abfd66d90e84be01a6af33db30645 100644 --- a/scripts/testv/stvFOA48c_cut.wav +++ b/scripts/testv/stvFOA48c_cut.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d86c4f8fcd8de2395cbe83a9d7846c107bf4a34c4878c6731827ff2acf6f9a7 +oid sha256:7a0a1925ddcc6c0d3a6fbfe727386a9c3ff902b0cb4f23a12f88a1747cc751c4 size 1920044