Commit 6f20b41a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] merge conflict for paramupmix

parent 2f686ef6

lib_dec/ivas_mc_paramupmix_dec.c

+8 −2
Original line number Diff line number Diff line
@@ -373,7 +373,10 @@ void ivas_mc_paramupmix_dec( 
                                  &st_ivas->splitBinRend.splitrend.multiBinPoseData,

#endif

                                  st_ivas->hCombinedOrientationData,

                                  subframeIdx, JBM_CLDFB_SLOTS_IN_SUBFRAME,

#ifndef API_5MS

                                  subframeIdx, /* TODO (5ms) : tmu2Dlb please verify */

#endif

                                  JBM_CLDFB_SLOTS_IN_SUBFRAME,

#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

                                  NULL,

#endif
@@ -1175,7 +1178,10 @@ static void ivas_mc_paramupmix_dec_sf( 
                          &st_ivas->splitBinRend.splitrend.multiBinPoseData,

#endif

                          st_ivas->hCombinedOrientationData,

                          subframeIdx, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx],

#ifndef API_5MS

                          subframeIdx, /* TODO (5ms) : tmu2Dlb please verify */

#endif

                          st_ivas->hTcBuffer->subframe_nbslots[subframeIdx],

                          Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural,

                          Cldfb_RealBuffer_subfr,

                          Cldfb_ImagBuffer_subfr );