Commit e25da5be authored by emerit's avatar emerit
Browse files

bug fix version ok

parent 500c313d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ ivas_error ivas_ism_config(
        {
            nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS;
#ifdef ISM_NON_DIEGETIC_PAN
            if ( ism_extended_metadata_flag & 0x2 )
            if ( ism_extended_metadata_flag )
            {
                nb_bits_metadata[0] += ISM_METADATA_IS_NDP_BITS;
            }
+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@
#define NON_DIEGETIC_PAN
#define FIX_CRASH_EVS_BITSTREAM_WITH_OUTPUT
#define ISM_NON_DIEGETIC_PAN
#define ISM_NON_DIEGETIC_PAN_SID
//#define ISM_NON_DIEGETIC_PAN_SID

#define FIX_CLANG_WARNING

+5 −0
Original line number Diff line number Diff line
@@ -313,7 +313,9 @@ ivas_error ivas_ism_metadata_enc(
    {
        push_indice( hBstr, IND_ISM_METADATA_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS );
    }
#endif

#ifdef ISM_NON_DIEGETIC_PAN
    for ( ch = 0; ch < nchan_ism; ch++ )
    {
        ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag;
@@ -347,6 +349,9 @@ ivas_error ivas_ism_metadata_enc(
    {
        push_indice( hBstr, IND_ISM_METADATA_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS );
    }
#endif

#ifndef ISM_NON_DIEGETIC_PAN

    for ( ch = 0; ch < nchan_ism; ch++ )
    {