Commit 50dd9f15 authored by vaillancour's avatar vaillancour
Browse files

fix ISM high rate BE issue

parent 51e30f55

lib_enc/avq_cod_fx.c

+7 −3
Original line number Diff line number Diff line
@@ -471,7 +471,11 @@ void AVQ_encmux_fx( 
                bitsMod = 0;

                move16();

            }

#ifdef REUSE_EVS_BE_ACELP_AVQ

            ELSE IF( GT_16( nq_est, 4 ) && ( ( bitsMod == 0 && GT_16( nullVec, 3 ) && LT_16( nullVec, 6 ) ) || ( EQ_16( bitsMod, 4 ) && EQ_16( nullVec, 5 ) ) ) && nq[svOrder[Nsvm2]] == 0 ) /* wasted bits 4, 5 for nq 6,7..*/

#else

            ELSE IF( nq_est > 4 && ( ( bitsMod == 0 && GT_16( nullVec, 3 ) && GT_16( nullVec, 6 ) ) || ( EQ_16( bitsMod, 4 ) && EQ_16( nullVec, 5 ) ) ) && nq[svOrder[Nsvm2]] == 0 )     /* wasted bits 4, 5 for nq 6,7..*/

#endif

            {

                overflow = 0;

                move16();
@@ -858,7 +862,7 @@ void AVQ_encmux_ivas_fx( 
                bits = sub( bits, 1 );

            }



            wrte_cv_ivas_fx( hBstr, nq[k], i_ind, kv_ind, I[k], &kv[k * 8], &bits );

            wrte_cv( hBstr, nq[k], i_ind, kv_ind, I[k], &kv[k * 8], &bits );

        }

    } /* for */

    /* Bit Saving Solution */
@@ -1016,7 +1020,7 @@ void AVQ_encmux_ivas_fx( 
        move16();



        /* write codebook indices (rank I and event. Voronoi index kv) */

        wrte_cv_ivas_fx( hBstr, nq[i], i_ind, kv_ind, I[i], &kv[i * 8], &bits );

        wrte_cv( hBstr, nq[i], i_ind, kv_ind, I[i], &kv[i * 8], &bits );



        bits = sub( bits, dummy_bits );