Commit 6983ec74 authored by vaclav's avatar vaclav
Browse files

properly exit when DTX operation is requested on the command-line

parent 650d63e9

lib_enc/ivas_init_enc.c

+0 −5
Original line number Diff line number Diff line
@@ -178,11 +178,6 @@ void ivas_write_format_sid( 
                ind = SID_MASA_2TC;

            }

            break;

#ifdef MASA_AND_OBJECTS

        case MASA_ISM_FORMAT: /* TODO Nokia: Finalize for SID case */

            ind = 8;

            break;

#endif

        default:

            assert( !"Reserved SID format symbol written." );

            break;

lib_enc/lib_enc.c

+5 −1
Original line number Diff line number Diff line
@@ -941,7 +941,11 @@ static ivas_error configureEncoder( 


    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT &&

         ( ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) ||

           hEncoderConfig->ivas_format == MC_FORMAT ) )

           hEncoderConfig->ivas_format == MC_FORMAT

#ifdef MASA_AND_OBJECTS

           || hEncoderConfig->ivas_format == MASA_ISM_FORMAT

#endif

           ) )

    {

        return IVAS_ERROR( IVAS_ERR_DTX_NOT_SUPPORTED, "DTX is not supported in this IVAS format and element mode." );

    }