Commit 9751a586 authored by norvell's avatar norvell
Browse files

Merge branch... 

Merge branch '704-disable-split_rend_with_head_rot-in-main-enable-in-test-jobs' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 704-disable-split_rend_with_head_rot-in-main-enable-in-test-jobs
parents 5f23e6f9 5f93484b

lib_dec/ivas_mc_paramupmix_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -531,7 +531,9 @@ void ivas_mc_paramupmix_dec_render( 
    int16_t slots_to_render, first_sf, last_sf, subframe_idx;

    uint16_t slot_size, ch;

    float *output_f_local[MAX_OUTPUT_CHANNELS];

#ifdef SPLIT_REND_WITH_HEAD_ROT

    int16_t slot_index_start;

#endif

    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;



    hMCParamUpmix = st_ivas->hMCParamUpmix;
@@ -573,17 +575,20 @@ void ivas_mc_paramupmix_dec_render( 
            mvr2r( hMCParamUpmix->beta_prev[ch], hMCParamUpmix->beta_sf[ch], IVAS_MAX_NUM_BANDS );

        }



#ifdef SPLIT_REND_WITH_HEAD_ROT

        slot_index_start = 0;

#endif

        for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )

        {

            int16_t n_samples_sf = slot_size * st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];



#ifdef SPLIT_REND_WITH_HEAD_ROT

            ivas_mc_paramupmix_dec_sf( st_ivas, output_f_local, slot_index_start );



            slot_index_start += st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];

#else

            ivas_mc_paramupmix_dec_sf( st_ivas, output_f_local );

#endif

            slot_index_start += st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];

            for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )

            {

                output_f_local[ch] += n_samples_sf;

lib_rend/ivas_CQMFDecoder.c

+3 −2
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ Nations Convention on Contracts on the International Sales of Goods. 


#include "ivas_CQMFDecoder.h"

#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT



#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#include "ivas_NoiseGen.h"

#include "ivas_PerceptualModel.h"

#include "ivas_lcld_tables.h"

lib_rend/ivas_CQMFDecoder.h

+12 −11
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ extern "C" 
#endif



#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT



#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#include "lib_rend.h"

#define DECODER_ERROR_NONE               ( 0 )

#define DECODER_ERROR_FS_NOT_SUPPORTED   ( -1 )

lib_rend/ivas_CQMFEncoder.c

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ 


#include "ivas_CQMFEncoder.h"

#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#include <stdio.h>

#include <math.h>

#include <stdlib.h>

lib_rend/ivas_CQMFEncoder.h

+19 −16
Original line number Diff line number Diff line
@@ -37,8 +37,11 @@ 
extern "C"

{

#endif



#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#include "lib_rend.h"

#define ENCODER_ERROR_NONE               ( 0 )

#define ENCODER_ERROR_FS_NOT_SUPPORTED   ( -1 )