Commit 9fbc3767 authored by vaclav's avatar vaclav
Browse files

- Merge branch '247-external-renderer-command-line' of... 

- Merge branch '247-external-renderer-command-line' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 247-external-renderer-command-line
parents f740b18b d1428a9e

apps/renderer.c

+6 −7
Original line number Diff line number Diff line
@@ -225,8 +225,9 @@ typedef enum 
    CmdLnOptionId_exteriorOrientationFile,

#ifdef NONBE_UNIFIED_DECODING_PATHS

    CmdLnOptionId_framing,

#endif

#else

    CmdLnOptionId_framing5ms,

#endif

    CmdLnOptionId_syncMdDelay,

    CmdLnOptionId_directivityPatternId,

    CmdLnOptionId_acousticEnvironmentId
@@ -402,13 +403,14 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "fr",

        .description = "Set Render audio framing.",

    },

#endif

#else

    {

        .id = CmdLnOptionId_framing5ms,

        .match = "framing_5ms",

        .matchShort = "fr5",

        .description = "Render audio with 5 ms framing.",

    },

#endif

    {

        .id = CmdLnOptionId_syncMdDelay,

        .match = "sync_md_delay",
@@ -2893,16 +2895,13 @@ static void parseOption( 
            }



            break;

#endif

#else

        case CmdLnOptionId_framing5ms:

            assert( numOptionValues == 0 );

#ifdef NONBE_UNIFIED_DECODING_PATHS

            args->render_framesize = IVAS_RENDER_FRAMESIZE_5MS;

#else

            args->framing_5ms = true;

#endif

            fprintf( stderr, "Warning: this is a placeholder for 5ms framing.\n" );

            break;

#endif

        case CmdLnOptionId_directivityPatternId:

            assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS );

            for ( int16_t i = 0; i < numOptionValues; ++i )

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */

#define FIX_740_MASA_PREREND_VALIDITY_CHECK             /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */

#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE          /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */



#define FIX_740_MASA_PREREND_VALIDITY_CHECK             /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */



/* #################### End BE switches ################################## */

tests/renderer/utils.py

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ def run_renderer( 
        cmd.extend(["-render_config", str(config_file)])



    if framing_5ms:

        cmd.extend(["-fr5"])

        cmd.extend(["-fr", "5"])



    # Set env variables for UBSAN

    env = os.environ.copy()