Commit e2a16f74 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] skip conversion to short if upmixing EVS JBM

parent 270cae4d

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "Options:\n" );

    fprintf( stdout, "--------\n" );

#ifdef FIX_1419_MONO_STEREO_UMX

    fprintf( stdout, "-evs                : Specify EVS mode for supplied bitstream\n" );

    fprintf( stdout, "-evs                : Specify that the supplied bitstream is an EVS bitstream\n" );

#endif

    fprintf( stdout, "-VOIP               : VoIP mode: RTP in G192\n" );

    fprintf( stdout, "-VOIP_hf_only=0     : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump\n" );

lib_dec/lib_dec_fx.c

+19 −1
Original line number Diff line number Diff line
@@ -5364,7 +5364,21 @@ static ivas_error printConfigInfo_dec( 
        }

        ELSE

        {

#ifdef FIX_1419_MONO_STEREO_UMX

            output_config = st_ivas->hDecoderConfig->output_config;

            IF( NE_16( (Word16) output_config, IVAS_AUDIO_CONFIG_MONO ) )

            {

                get_channel_config( output_config, &config_str[0] );

                fprintf( stdout, "Output configuration:   mono EVS bit-exact decoding rendering to %s\n", config_str );

            }

            ELSE

            {

#endif

                fprintf( stdout, "Output configuration:   mono EVS bit-exact decoding\n" );

#ifdef FIX_1419_MONO_STEREO_UMX

            }

#endif

            ;

        }

    }

    ELSE
@@ -5641,7 +5655,11 @@ static ivas_error evs_dec_main_fx( 
        v_multc_fx_16( p_output_fx[0], mixer_left_fx, p_output_fx[0], nOutSamples );  /* Q11 */

    }



#ifdef FIX_1419_MONO_STEREO_UMX

    IF( st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hDecoderConfig->nchan_out == 1 )

#else

    IF( st_ivas->hDecoderConfig->Opt_tsm )

#endif

    {

        /* BE workaround: in order to keep EVS bit-exact wrt. TS 26.443, convert 'float' output data to 'short' before the TSM */ // TODO: verify if it is still needed and if it works well for EVS stereo panning output

#ifdef JBM_MEMORY_OPT

readme.txt

+4 −2
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ The usage of the "IVAS_dec" program is as follows: 
--------------------------------------------------



Usage for EVS:   IVAS_dec.exe [Options] Fs bitstream_file output_file

                 OR usage for IVAS (below) with -evs option and OutputConf

Usage for IVAS:  IVAS_dec.exe [Options] OutputConf Fs bitstream_file output_file



Mandatory parameters:
@@ -274,6 +275,7 @@ output_file : Output audio filename 


Options:

--------

-evs                : Specify that the supplied bitstream is an EVS bitstream

-VOIP               : VoIP mode: RTP in G192

-VOIP_hf_only=0     : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump

-VOIP_hf_only=1     : VoIP mode: EVS RTP Payload Format hf_only=1 in rtpdump