From cf372e4b4f1d51b3b49e76f3218d311d539ca9e6 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 11 Aug 2023 15:50:20 +0200 Subject: [PATCH 1/2] create CPE for stereo upmix in OSBA with one transport channel --- lib_dec/ivas_init_dec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index bee42c25c6..bc9a730934 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1537,6 +1537,18 @@ ivas_error ivas_init_decoder( } } + /* create CPE element for DFT Stereo like upmix */ + if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 ) + { + if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) + { + return error; + } + + st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ + st_ivas->hCPE[0]->hCoreCoder[1] = NULL; + } + #ifdef OSBA_BR_SWITCHING if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { -- GitLab From 63ceea4393e7161df5b2ca2996b2f1d00a449f44 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 11 Aug 2023 19:07:10 +0200 Subject: [PATCH 2/2] wrap in switch --- lib_com/options.h | 1 + lib_dec/ivas_init_dec.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 6d126861a2..a743e2d2c9 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -240,6 +240,7 @@ #define FIX_657_REMOVE_EDITING /* Nokia: Remove remaining unused coded related to object editing */ #define FIX_634_MASA_JBM_UNUSED_PARAMETER /* Nokia: Fix issue 634 by removing the unnecessary argument. */ #define FIX_675_WB_OMASA /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */ +#define FIX_691_OSBA_CRASH /* FhG: Fix for issue 691: Crash for OSBA Stereo out */ /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index bc9a730934..4e7aac757f 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1537,6 +1537,7 @@ ivas_error ivas_init_decoder( } } +#ifdef FIX_691_OSBA_CRASH /* create CPE element for DFT Stereo like upmix */ if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 ) { @@ -1548,6 +1549,7 @@ ivas_error ivas_init_decoder( st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ st_ivas->hCPE[0]->hCoreCoder[1] = NULL; } +#endif #ifdef OSBA_BR_SWITCHING if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) -- GitLab