Commit d3cc9b5d authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into revision_of_todos

parents 398f6100 92420d58

lib_com/bitstream.c

+1 −2
Original line number Diff line number Diff line
@@ -3277,8 +3277,7 @@ ivas_error read_indices( 
    }



    /* GOOD frame */

    if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE

    )

    if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE )

    {

        /* GOOD frame - convert ITU-T G.192 words to short values */

        st_ivas->hDecoderConfig->ivas_total_brate = total_brate;

lib_com/ivas_error.h

+4 −0
Original line number Diff line number Diff line
@@ -235,7 +235,11 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_INPUT_FORMAT:

#ifdef FIX_510

            return "Invalid input format";

#else

            return "Invalid format of input bitstream";

#endif

        case IVAS_ERR_INVALID_INDEX:

            return "Invalid index";

        default:

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -224,11 +224,12 @@ 
#define FIX_483                                         /* FhG: fix issue 483, division by zero in nois_est */

#define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */

#define FIX_170_DTX_MASA                                /* Nokia: Fix issue 170, relaxing the use of DTX in MASA format */



#define FIX_510                                         /* FhG: fix issue 510, misleading error message for invalid input format */

#define FIX_509                                         /* FhG: fix issue 509, too low number of bitsream indices in SBA */



#define FIX_TODO_NON_DIEGETIC_PAN_NOT_IMPLELENTED_IN_RENDERER /* ..\apps\renderer.c(240):  .... (todo: implementation)",*/





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -3211,7 +3211,11 @@ static ivas_error input_format_API_to_internal( 
            *sdp_hf_only = 1;

            break;

        default:

#ifdef FIX_510

            return IVAS_ERR_INVALID_BITSTREAM;

#else

            return IVAS_ERR_INVALID_INPUT_FORMAT;

#endif

            break;

    }

apps/renderer.c

+1 −1

File changed.

Contains only whitespace changes.