Commit 3a716a45 authored by Jan Kiene's avatar Jan Kiene
Browse files

port MR 1413 from float 

fix ISM1 non-diegetic panning
parent 30f20459

lib_com/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -803,6 +803,9 @@ void dtx_read_padding_bits( 
);



void ivas_apply_non_diegetic_panning( 

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    float *input_f,                                             /* i  : non-diegetic object                                         */

#endif

    float *output_f[],                                          /* i/o: core-coder transport mono channel/stereo output             */

    const float non_diegetic_pan_gain,                          /* i  : non-diegetic panning gain                                   */

    const int16_t output_frame                                  /* i  : output frame length per channel                             */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ 


#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1084,7 +1084,11 @@ ivas_error ivas_jbm_dec_render( 
            }

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

                ivas_apply_non_diegetic_panning( p_tc[0], p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

#else

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

#endif

            }



#ifdef DEBUGGING

lib_dec/ivas_mono_dmx_renderer.c

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ void ivas_mono_stereo_downmix_mcmasa( 
 *------------------------------------------------------------------------*/



void ivas_apply_non_diegetic_panning(

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    float *input_f, /* i  : non-diegetic object                                         */

#endif

    float *output_f[],                 /* i/o: core-coder transport mono channel/stereo output  */

    const float non_diegetic_pan_gain, /* i  : non-diegetic panning gain                        */

    const int16_t output_frame         /* i  : output frame length per channel                  */
@@ -230,8 +233,13 @@ void ivas_apply_non_diegetic_panning( 
    pan_left = ( non_diegetic_pan_gain + 1.f ) * 0.5f;

    pan_right = 1.f - pan_left;



#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    v_multc( input_f, pan_right, output_f[1], output_frame );

    v_multc( input_f, pan_left, output_f[0], output_frame );

#else

    v_multc( output_f[0], pan_right, output_f[1], output_frame );

    v_multc( output_f[0], pan_left, output_f[0], output_frame );

#endif



    return;

}