Commit 753f2543 authored by Stephane Ragot's avatar Stephane Ragot
Browse files

fixes for pipeline

parent 6c4da71a

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ $(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(L 
	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)



$(CLI_APIENC_FMTSW): $(OBJS_CLI_APIENC_FMTSW) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC_FMTSW)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC_FMTSW) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC_FMTSW)



$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)

apps/encoder_fmtsw.c

+8 −12
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 


*******************************************************************************************************/



#define _POSIX_C_SOURCE /* for strtok_r() in string.h */



#include "lib_enc.h"

#include <string.h>

#include "cmdl_tools.h"
@@ -180,7 +178,7 @@ static bool readBitrate( FILE *file, int32_t *bitrate ); 
static ivas_error readForcedMode( FILE *file, IVAS_ENC_FORCED_MODE *forcedMode, int32_t *forceFrameCounter );

static IVAS_ENC_FORCED_MODE parseForcedMode( char *forcedModeChar );

#endif

static int main_encoder( int argc, char *argv[] );

static int encoder_main( int argc, char *argv[] );

static void str2arg( char *str, int *argc_local, char *argv_local[] );
@@ -228,7 +226,7 @@ int main( 
        }

        printf( "Processing format switching commandline: %s\n", line );

        str2arg( line, &argc_local, argv_local );

        main_encoder( argc_local, argv_local );

        encoder_main( argc_local, argv_local );

    }

    fclose( FmtSWFile );

    exit( 0 );
@@ -246,20 +244,18 @@ void str2arg( 
)

{

    int i = 0;

    for ( i = 0; i < MAX_ARGV; i++ )

    char *token = strtok( str, " " );

    while ( token && ( i < MAX_ARGV - 1 ) )

    {

#ifdef WIN32

        if ( ( argv_local[i] = strtok_s( NULL, " ", &str ) ) == NULL )

#else

        if ( ( argv_local[i] = strtok_r( NULL, " ", &str ) ) == NULL )

#endif

            break;

        argv_local[i++] = token;

        token = strtok( 0, " " );

    }

    argv_local[i] = 0;

    *argc_local = i;

    return;

}



int main_encoder(

int encoder_main(

    int argc,

    char *argv[] )

{