Commit 0bcb8dd2 authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

fix 109/343 conflicts

parent 8cb56512

apps/decoder.c

+8 −5
Original line number Diff line number Diff line
@@ -932,6 +932,7 @@ static bool parseCmdlIVAS_dec( 
                usage_dec();

                return false;

            }

#else



#ifdef FIX_343_TO_UPPER

            strncpy( argv_to_upper, argv[i + 1], sizeof( argv_to_upper ) - 1 );
@@ -956,18 +957,20 @@ static bool parseCmdlIVAS_dec( 
            char tmp[4];

            strcpy( tmp, argv[i + 1] );

#endif

#ifdef FIX_I109_ORIENTATION_TRACKING // TODO @Philips needs merge with FIX_343_TO_UPPER

#ifdef FIX_I109_ORIENTATION_TRACKING

#ifndef FIX_343_TO_UPPER

            if ( strcmp( to_upper( tmp ), "NON" ) == 0 )

#else

            char *tmp = to_upper( argv[i + 1] );

            if ( strcmp( to_upper( tmp ), "NONE" ) == 0 )

#endif

            {

                arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE;

            }

            else if ( strcmp( to_upper( tmp ), "REF" ) == 0 )

#else





            if ( strcmp( to_upper( tmp ), "REF" ) == 0 )

#endif

#endif /* 109 */

            {

                arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF;

            }
@@ -981,7 +984,7 @@ static bool parseCmdlIVAS_dec( 
                usage_dec();

                return false;

            }

#endif

#endif /* n109 */

            i += 2;

        }

#ifdef FIX_I109_ORIENTATION_TRACKING