Commit 7611d580 authored by malenov's avatar malenov
Browse files

fix the I/O interface

parent ebc2a473

apps/encoder.c

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ typedef struct 
#ifdef DEBUGGING

    IVAS_ENC_FORCED_MODE forcedMode;

    const char *forcedModeFile;

#ifdef DEBUG_FORCE_DIR

    const char *forcedModeDir;

#endif

#endif

    bool pca;

    bool ism_extended_metadata;

lib_enc/ivas_decision_matrix_enc.c

+26 −0
Original line number Diff line number Diff line
@@ -354,6 +354,19 @@ void ivas_decision_matrix_enc_fx( 
                    }

                }

            }



#ifdef DEBUG_FORCE_DIR

            if ( st->force_dir[0] != '\0' )

            {

                dbgread( &st->extl, sizeof( int16_t ), 1, fname( st->force_dir, "force_extl.enf", -1, -1, -1 ) );

                dbgread( &st->extl_brate, sizeof( int32_t ), 1, fname( st->force_dir, "force_extl_brate.enf", -1, -1, -1 ) );

            }

            else

            {

                dbgwrite( &st->extl, sizeof( int16_t ), 1, 1, "res/force_extl.enf" );

                dbgwrite( &st->extl_brate, sizeof( int32_t ), 1, 1, "res/force_extl_brate.enf" );

            }

#endif

        }



        /* SWB and FB */
@@ -451,6 +464,19 @@ void ivas_decision_matrix_enc_fx( 
                move32();

            }



#ifdef DEBUG_FORCE_DIR

            if ( st->force_dir[0] != '\0' )

            {

                dbgread( &st->extl, sizeof( int16_t ), 1, fname( st->force_dir, "force_extl.enf", -1, -1, -1 ) );

                dbgread( &st->extl_brate, sizeof( int32_t ), 1, fname( st->force_dir, "force_extl_brate.enf", -1, -1, -1 ) );

            }

            else

            {

                dbgwrite( &st->extl, sizeof( int16_t ), 1, 1, "res/force_extl.enf" );

                dbgwrite( &st->extl_brate, sizeof( int32_t ), 1, 1, "res/force_extl_brate.enf" );

            }

#endif



            /* set IC-BWE bitrate */

            test();

            test();

lib_enc/lib_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ ivas_error IVAS_ENC_SetForcedMode( 
    }



#ifdef DEBUG_FORCE_DIR

    if ( forcedModeDir == NULL )

    if ( forcedMode < IVAS_ENC_FORCE_FILE )

    {

        hIvasEnc->st_ivas->hEncoderConfig->force_dir[0] = '\0';
@@ -1903,7 +1903,7 @@ ivas_error IVAS_ENC_SetForcedMode( 
            hIvasEnc->switchingActive = true;

        }

    }

    else

    else if ( forcedMode == IVAS_ENC_FORCE_DIR )

    {

        strcpy( hIvasEnc->st_ivas->hEncoderConfig->force_dir, forcedModeDir );

        hIvasEnc->st_ivas->hEncoderConfig->force = IVAS_ENC_FORCE_UNFORCED;

lib_enc/lib_enc.h

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ typedef enum _IVAS_ENC_FORCED_MODE 
    IVAS_ENC_FORCE_GSC,

    IVAS_ENC_FORCE_TCX,

    IVAS_ENC_FORCE_HQ,

#ifdef DEBUG_FORCE_DIR

    IVAS_ENC_FORCE_FILE,

    IVAS_ENC_FORCE_DIR,

#endif

    IVAS_ENC_FORCE_UNFORCED,

    IVAS_ENC_FORCE_UNDEFINED = 0xffff

} IVAS_ENC_FORCED_MODE;