Commit f1a7b982 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Revert "preliminarily fix metadata bit in OSBA in encoder" 

This reverts commit e5b5d2de.
parent e5b5d2de

lib_enc/ivas_ism_metadata_enc.c

+47 −44
Original line number Diff line number Diff line
@@ -386,19 +386,22 @@ ivas_error ivas_ism_metadata_enc( 
            hIsmMeta[ch]->ism_md_null_flag = null_metadata_flag[ch];

            hIsmMeta[ch]->ism_md_lowrate_flag = lowrate_metadata_flag[ch];

        }

        else if ( null_metadata_flag[ch] )

        else

#ifdef SBA_AND_OBJECTS

            if ( ism_mode != ISM_SBA_MODE_DISC )

#endif

        {

#endif

            if ( null_metadata_flag[ch] )

            {

                /* signal NULL metadata frame */

                push_indice( hBstr, IND_ISM_MD_NULL_FLAG, 1, ISM_METADATA_MD_FLAG_BITS );



                /* write the ISM class to ISM_NO_META and again the true ISM class */

                push_indice( hBstr, IND_ISM_METADATA_FLAG, ISM_NO_META, ISM_METADATA_FLAG_BITS );

            if ( ism_mode != ISM_SBA_MODE_DISC )

            {

                push_indice( hBstr, IND_ISM_MD_INACTIVE_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS );

            }

        }

        else if ( ism_mode != ISM_SBA_MODE_DISC )

            else

            {

                push_indice( hBstr, IND_ISM_METADATA_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS );
@@ -411,6 +414,10 @@ ivas_error ivas_ism_metadata_enc( 
                    push_indice( hBstr, IND_ISM_MD_INACTIVE_FLAG, lowrate_metadata_flag[ch], ISM_METADATA_INACTIVE_FLAG_BITS );

                }

            }

#ifdef MASA_AND_OBJECTS

        }

#endif

#ifdef SBA_AND_OBJECTS

        else /*ism_mode == ISM_SBA_MODE_DISC*/

        {

            /* all objects are considered active*/
@@ -823,10 +830,6 @@ ivas_error ivas_ism_metadata_enc( 
        }

    }

	}

    else

    {

        return error;

    }

#else

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

    {