Commit c1f85257 authored by vaclav's avatar vaclav
Browse files

Merge branch '1209-leftovers-in-ivas-sid-signalling' into 'main' 

Leftovers for FIX_1209_SID_SIGNALING

See merge request !1856
parents d97ec9ca 6fbe6ab0

lib_com/bitstream.c

+4 −0
Original line number Diff line number Diff line
@@ -2624,9 +2624,11 @@ ivas_error preview_indices( 
            case SID_ISM:

                st_ivas->ivas_format = ISM_FORMAT;

                break;

#ifndef FIX_1209_SID_SIGNALING

            case SID_MULTICHANNEL:

                st_ivas->ivas_format = MC_FORMAT;

                break;

#endif

            case SID_SBA_1TC:

                st_ivas->ivas_format = SBA_FORMAT;

                st_ivas->element_mode_init = IVAS_SCE;
@@ -2651,7 +2653,9 @@ ivas_error preview_indices( 
                }

                break;

            default:

#ifndef FIX_1209_SID_SIGNALING

                /* This should actually be impossible, since only 3 bits are read, so if this happens something is broken */

#endif

                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Invalid value %c found in SID format field.", st_ivas->sid_format );

        }

    }