Commit 28d09845 authored by Stephane Ragot's avatar Stephane Ragot
Browse files

propagating is_binaural as extra information for stereo dmx; for stereo... 

propagating is_binaural as extra information for stereo dmx; for stereo is_binaural is available in st_ivas->hEncoderConfig so no extra change required
parent dc1ecdb5

lib_com/ivas_prot.h

+5 −0
Original line number Diff line number Diff line
@@ -61,7 +61,12 @@ void stereo_dmx_evs_enc( 
    STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS,                    /* i/o: Stereo downmix for EVS encoder handle   */

    const int32_t input_Fs,                                     /* i  : input sampling rate                     */

    int16_t data[CPE_CHANNELS * L_FRAME48k],                    /* i/o: input signal                            */

#ifdef BINAURAL_AUDIO_CMDLINE

    const int16_t n_samples,                                    /* i  : number of input samples                 */

    const bool is_binaural                                      /* i  : indication that input is binaural audio */

#else

    const int16_t n_samples                                     /* i  : number of input samples                 */

#endif

);



/*! r: number of channels to be analysed */

lib_enc/ivas_stereo_dmx_evs.c

+6 −1
Original line number Diff line number Diff line
@@ -788,7 +788,12 @@ void stereo_dmx_evs_enc( 
    STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS, /* i/o: Stereo downmix for EVS encoder handle  */

    const int32_t input_Fs,                  /* i  : input sampling rate                    */

    int16_t data[CPE_CHANNELS * L_FRAME48k], /* i/o: input signal                           */

#ifdef BINAURAL_AUDIO_CMDLINE

    const int16_t n_samples, /* i  : number of input samples                 */

    const bool is_binaural   /* i  : indication that input is binaural audio */

#else

    const int16_t n_samples /* i  : number of input samples                */

#endif

)

{

    int16_t n;

lib_enc/lib_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -1261,7 +1261,11 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( 
        if ( hEncoderConfig->stereo_dmx_evs == 1 )

        {

            inputBufferSize /= 2;

#ifdef BINAURAL_AUDIO_CMDLINE

            stereo_dmx_evs_enc( st_ivas->hStereoDmxEVS, hEncoderConfig->input_Fs, inputBuffer, inputBufferSize, hEncoderConfig->is_binaural);

#else

            stereo_dmx_evs_enc( st_ivas->hStereoDmxEVS, hEncoderConfig->input_Fs, inputBuffer, inputBufferSize );

#endif

        }



        if ( hEncoderConfig->Opt_AMR_WB )