Commit e96b1e04 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1726_fix' into 'main' 

Fix for 3GPP issue 1726: Renderer crash with assert for OMASA to MONO (renderBufferChannelLerp_fx)

See merge request !1734
parents ced61be1 26272ddd

lib_com/cnst.h

+10 −8
Original line number Diff line number Diff line
@@ -45,20 +45,22 @@ 
#define MATRIX_CONSTANT (759250113) 

#define NUM_SAMPLES_960 (960)

#define NUM_SAMPLES_720 (720)

#define NUM_SAMPLES_640 (640)

#define NUM_SAMPLES_320 (320)

#define NUM_SAMPLES_160 (160)

#define L_SUBFRAME_48k         (240)

#define L_SUBFRAME_32k         (180)

#define L_SUBFRAME_16k         (80)

#define L_SUBFRAME_8k           (40)

#define Q31_BY_NUM_SAMPLES_960 ( 2239294 )

#define Q31_BY_NUM_SAMPLES_720 ( 2986764 )

#define Q31_BY_NUM_SAMPLES_320 ( 6731924 )

#define Q31_BY_NUM_SAMPLES_160 ( 13506186 )

#define Q31_BY_SUB_FRAME_240 ( 8985287 )

#define Q31_BY_SUB_FRAME_180 ( 11997115 )

#define Q31_BY_SUB_FRAME_80  ( 27183337 )

#define Q31_BY_SUB_FRAME_40  ( 55063683 )

#define Q31_BY_NUM_SAMPLES_960 ( 2239294 ) /* 1/959 in Q31 */

#define Q31_BY_NUM_SAMPLES_720 ( 2986764 ) /* 1/719 in Q31 */

#define Q31_BY_NUM_SAMPLES_640 ( 3360694 ) /* 1/639 in Q31 */

#define Q31_BY_NUM_SAMPLES_320 ( 6731924 ) /* 1/319 in Q31 */

#define Q31_BY_NUM_SAMPLES_160 ( 13506186 ) /* 1/159 in Q31 */

#define Q31_BY_SUB_FRAME_240 ( 8985287 ) /* 1/239 in Q31 */

#define Q31_BY_SUB_FRAME_180 ( 11997115 ) /* 1/179 in Q31 */

#define Q31_BY_SUB_FRAME_80  ( 27183337 ) /* 1/79 in Q31 */

#define Q31_BY_SUB_FRAME_40  ( 55063683 ) /* 1/39 in Q31 */





/*----------------------------------------------------------------------------------*

lib_rend/lib_rend_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -4579,6 +4579,12 @@ static void renderBufferChannelLerp_fx( 
                        move32();

                        move32();

                        BREAK;

                    case NUM_SAMPLES_640:

                        tmp = Q31_BY_NUM_SAMPLES_640;

                        tmp1 = 639; /* NUM_SAMPLES_640 - 1 */

                        move32();

                        move32();

                        BREAK;

                    case NUM_SAMPLES_320:

                        tmp = Q31_BY_NUM_SAMPLES_320;

                        tmp1 = 319; /* NUM_SAMPLES_320 - 1 */