Commit 62c5ddfb authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

set gain_bed to -1.0 when editing it is not supported

parent e791e95e

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ ivas_error ivas_sba_dec_render( 
    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    {

        float gain = st_ivas->hSbaIsmData->gain_bed;

        if ( gain != 1.0f )

        if ( gain != 1.0f && gain >= 0.0f )

        {

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

            {

lib_dec/lib_dec.c

+5 −2
Original line number Diff line number Diff line
@@ -1106,6 +1106,7 @@ ivas_error IVAS_DEC_GetEditableParameters( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



	hIvasEditableParameters->gain_bed = -1.0f;

    hIvasEditableParameters->num_obj = hIvasDec->st_ivas->nchan_ism;

    if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT )

    {
@@ -1123,6 +1124,9 @@ ivas_error IVAS_DEC_GetEditableParameters( 
                hIvasEditableParameters->ism_metadata[obj].radius = hIvasDec->st_ivas->hIsmMetaData[obj]->radius;

                hIvasEditableParameters->ism_metadata[obj].gain = hIvasDec->st_ivas->hIsmMetaData[obj]->edited_gain;

                hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = hIvasDec->st_ivas->hIsmMetaData[obj]->non_diegetic_flag;

            }

			if ( hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )

			{

				hIvasEditableParameters->gain_bed = 1.0f;

			}

        }
@@ -1139,7 +1143,6 @@ ivas_error IVAS_DEC_GetEditableParameters( 
                hIvasEditableParameters->ism_metadata[obj].radius = 0.0f;

                hIvasEditableParameters->ism_metadata[obj].gain = 1.0f;

                hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = 0;

                hIvasEditableParameters->gain_bed = 1.0f;

            }

        }

        else