Merge remote-tracking branch 'origin' into... (fd094ee7) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+42 −36

Original line number	Diff line number	Diff line
		@@ -408,7 +408,6 @@ int main(

		asked_num_subframes = arg.render_num_subframes;
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : IVAS_DEFAULT_AEID;
		arg.enableHeadRotation = arg.enableHeadRotation \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM;

		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.render_num_subframes, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,
		arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.roomSize, arg.non_diegetic_pan_enabled,
		@@ -418,22 +417,10 @@ int main(
		goto cleanup;
		}

		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( arg.render_num_subframes != asked_num_subframes )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for decoding to EXT!\n" );
		}

		/------------------------------------------------------------------------------------------
		* Configure Split rendering
		------------------------------------------------------------------------------------------/

		asked_num_subframes = arg.render_num_subframes;
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		@@ -441,6 +428,7 @@ int main(
		fprintf( stderr, "\nSplit rendering configure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}

		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
		{
		@@ -450,8 +438,7 @@ int main(

		if ( !arg.renderConfigEnabled && ( arg.render_num_subframes != asked_num_subframes ) )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		fprintf( stderr, "\nChanged render framesize, only 20ms allowed!\n" );
		}

		/------------------------------------------------------------------------------------------
		@@ -1996,6 +1983,7 @@ static ivas_error decodeG192(
		bool needNewFrame;
		int16_t nSamplesRendered, nSamplesRendered_loop, nSamplesToRender;
		IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { -12582912, 0, 0, 0, 22 }, { -12582912, 0, 0, 0, 22 }, { -12582912, 0, 0, 0, 22 }, { -12582912, 0, 0, 0, 22 } };
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
		int16_t vec_pos_update, vec_pos_len;
		SplitFileReadWrite *splitRendWriter = NULL;
		@@ -2144,10 +2132,8 @@ static ivas_error decodeG192(
		}

		/* Head-tracking input simulation */
		if ( arg.enableHeadRotation )
		if ( arg.enableHeadRotation \|\| isSplitRend )
		{
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

		if ( headRotReader == NULL )
		{
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		@@ -2187,7 +2173,6 @@ static ivas_error decodeG192(

		if ( arg.enableExternalOrientation )
		{
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int8_t enableHeadRotation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int8_t enableExternalOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		@@ -2534,16 +2519,30 @@ static ivas_error decodeG192(
		}

		/* Head-tracking input simulation */
		if ( arg.enableHeadRotation )
		if ( arg.enableHeadRotation \|\| isSplitRend )
		{
		if ( headRotReader == NULL )
		{
		Quaternions[i].w_fx = -12582912;
		Quaternions[i].x_fx = 0;
		Quaternions[i].y_fx = 0;
		Quaternions[i].z_fx = 0;
		Quaternions[i].q_fact = 22;
		Pos[i].x = 0.0f;
		Pos[i].y = 0.0f;
		Pos[i].z = 0.0f;
		Pos[i].q_fact = 25;
		}
		else
		{
		IVAS_QUATERNION Quaternion;
		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternion, &Pos[0] ) ) != IVAS_ERR_OK )
		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[0], &Pos[0] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), RotationFileReader_getFilePath( headRotReader ) );
		goto cleanup;
		}
		}

		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternion, Pos[0], 0, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[0], Pos[0], 0, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2775,6 +2774,7 @@ static ivas_error decodeVoIP(

		IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;
		IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { -12582912, 0, 0, 0, 22 }, { -12582912, 0, 0, 0, 22 }, { -12582912, 0, 0, 0, 22 }, { -12582912, 0, 0, 0, 22 } };
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
		int16_t vec_pos_update, vec_pos_len;
		int16_t nOutSamples = 0;
		@@ -2975,10 +2975,8 @@ static ivas_error decodeVoIP(
		}

		/* Head-tracking input simulation */
		if ( arg.enableHeadRotation )
		if ( arg.enableHeadRotation \|\| isSplitRend )
		{
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

		if ( headRotReader == NULL )
		{
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		@@ -3018,7 +3016,6 @@ static ivas_error decodeVoIP(

		if ( arg.enableExternalOrientation )
		{
		IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int8_t enableHeadRotation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int8_t enableExternalOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		@@ -3932,6 +3929,15 @@ static ivas_error restartDecoder(
		goto cleanup;
		}

		if ( arg->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nSplit rendering configure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}

		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg->render_num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

apps/encoder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2049,7 +2049,7 @@ static void usage_enc( void )
		fprintf( stdout, " where 0 = adaptive, 3-100 = fixed in number of frames,\n" );
		fprintf( stdout, " default is deactivated\n" );
		fprintf( stdout, "-dtx : Activate DTX mode with a SID update rate of 8 frames\n" );
		fprintf( stdout, " Note: DTX is supported in EVS, stereo, ISM, SBA up to 80kbps and MASA up to 128kbps \n" );
		fprintf( stdout, " Note: DTX is supported on all bitrates for EVS, stereo, ISM, and MASA, and up to 80 kbps for SBA.\n" );
		fprintf( stdout, "-rf p o : Activate channel-aware mode for WB and SWB signal at 13.2kbps, \n" );
		fprintf( stdout, " where FEC indicator, p: LO or HI, and FEC offset, o: 2, 3, 5, or 7 in number of frames.\n" );
		fprintf( stdout, " Alternatively p and o can be replaced by a rf configuration file with each line \n" );

apps/encoder_fmtsw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2152,7 +2152,7 @@ static void usage_enc( void )
		fprintf( stdout, " where 0 = adaptive, 3-100 = fixed in number of frames,\n" );
		fprintf( stdout, " default is deactivated\n" );
		fprintf( stdout, "-dtx : Activate DTX mode with a SID update rate of 8 frames\n" );
		fprintf( stdout, " Note: DTX is supported in EVS, stereo, ISM, SBA up to 80kbps and MASA up to 128kbps \n" );
		fprintf( stdout, " Note: DTX is supported on all bitrates for EVS, stereo, ISM, and MASA, and up to 80 kbps for SBA.\n" );
		fprintf( stdout, "-rf p o : Activate channel-aware mode for WB and SWB signal at 13.2kbps, \n" );
		fprintf( stdout, " where FEC indicator, p: LO or HI, and FEC offset, o: 2, 3, 5, or 7 in number of frames.\n" );
		fprintf( stdout, " Alternatively p and o can be replaced by a rf configuration file with each line \n" );

apps/isar_post_rend.c

+194 −160

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+33 −57

Original line number	Diff line number	Diff line
		@@ -231,90 +231,109 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_inputFile,
		.match = "input_file",
		.matchShort = "i",
		.placeholder = "<path>",
		.description = "Path to the input file (WAV, raw PCM or scene description file)",
		.isMandatory = true,
		},
		{
		.id = CmdLnOptionId_inputFormat,
		.match = "input_format",
		.matchShort = "if",
		.placeholder = "<format>",
		.description = "Audio format of input file (e.g. 5_1 or HOA3 or META,\nuse -l for a list)",
		.isMandatory = true,
		},
		{
		.id = CmdLnOptionId_inputMetadata,
		.match = "input_metadata",
		.matchShort = "im",
		.placeholder = "<path1> [<path2>...]",
		.description = "Space-separated list of path to metadata files for ISM/MASA/OMASA/\nOSBA/BINAURAL_SPLIT_PCM inputs. \nFor OMASA, ISM files must be specified first.",
		},
		{
		.id = CmdLnOptionId_outputFile,
		.match = "output_file",
		.matchShort = "o",
		.placeholder = "<path>",
		.description = "Path to the output file",
		.isMandatory = true,
		},
		{
		.id = CmdLnOptionId_outputFormat,
		.match = "output_format",
		.matchShort = "of",
		.placeholder = "<format>",
		.description = "Output format to render.\nAlternatively, can be a custom loudspeaker layout file",
		.isMandatory = true,
		},
		{
		.id = CmdLnOptionId_sampleRate,
		.match = "sample_rate",
		.matchShort = "fs",
		.placeholder = "<fs>",
		.description = "Input sampling rate in kHz (16, 32, 48) - required only with raw\nPCM inputs",
		},
		{
		.id = CmdLnOptionId_trajFile,
		.match = "trajectory_file",
		.matchShort = "T",
		.placeholder = "<path>",
		.description = "Head rotation trajectory file for simulation of head tracking\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_outputMetadata,
		.match = "output_metadata",
		.matchShort = "om",
		.placeholder = "<path>",
		.description = "coded metadata file for BINAURAL_SPLIT_PCM output mode",
		},
		{
		.id = CmdLnOptionId_refRotFile,
		.match = "reference_rotation_file",
		.matchShort = "rf",
		.placeholder = "<path>",
		.description = "Reference rotation trajectory file for simulation of head tracking\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_customHrtfFile,
		.match = "custom_hrtf",
		.matchShort = "hrtf",
		.placeholder = "<path>",
		.description = "Custom HRTF file for binaural rendering\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_renderConfigFile,
		.match = "render_config_parameters",
		.matchShort = "render_config",
		.placeholder = "<path>",
		.description = "Binaural renderer configuration parameters in file\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_nonDiegeticPan,
		.match = "non_diegetic_panning",
		.matchShort = "non_diegetic_pan",
		.placeholder = "<value>",
		.description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right,\ncenter or c or 0 ->middle",
		},
		{
		.id = CmdLnOptionId_orientationTracking,
		.match = "tracking_type",
		.matchShort = "otr",
		.placeholder = "<type>",
		.description = "Head orientation tracking type: 'none', 'ref', 'avg' or `ref_vec`\nor `ref_vec_lev` (only for binaural outputs)",
		},
		{
		.id = CmdlnOptionId_lfePosition,
		.match = "lfe_position",
		.matchShort = "lp",
		.placeholder = "<gain>,<azi>,<ele>",
		.description = "Output LFE position. Comma-delimited triplet of [gain, azimuth,\nelevation] where gain is linear (like --gain, -g) and azimuth,\nelevation are in degrees. If specified, overrides the default\nbehavior which attempts to map input to output LFE channel(s)",
		},
		{
		.id = CmdlnOptionId_lfeMatrix,
		.match = "lfe_matrix",
		.matchShort = "lm",
		.placeholder = "<path>",
		.description = "LFE panning matrix. File (CSV table) containing a matrix of\ndimensions [ num_input_lfe x num_output_channels ] with elements\nspecifying linear routing gain (like --gain, -g). If specified,\noverrides the output LFE position option and the default\nbehavior which attempts to map input to output LFE channel(s)",
		},
		{
		@@ -327,6 +346,7 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_complexityLevel,
		.match = "complexity_level",
		.matchShort = "level",
		.placeholder = "<level>",
		.description = "Complexity level, level = (1, 2, 3), will be defined after\ncharacterisation.",
		},
		{
		@@ -339,6 +359,7 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_inputGain,
		.match = "gain",
		.matchShort = "g",
		.placeholder = "<gain>",
		.description = "Input gain (linear, not in dB) to be applied to input audio file",
		},
		{
		@@ -351,43 +372,50 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_referenceVectorFile,
		.match = "reference_vector_file",
		.matchShort = "rvf",
		.placeholder = "<path>",
		.description = "Reference vector trajectory file for simulation of head tracking\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_exteriorOrientationFile,
		.match = "exterior_orientation_file",
		.matchShort = "exof",
		.placeholder = "<path>",
		.description = "External orientation trajectory file for simulation of external\norientations",
		},
		{
		.id = CmdLnOptionId_framing,
		.match = "framing",
		.matchShort = "fr",
		.description = "Set Render audio framing.",
		.placeholder = "<duration>",
		.description = "Set render audio framing in ms",
		},
		{
		.id = CmdLnOptionId_syncMdDelay,
		.match = "sync_md_delay",
		.matchShort = "smd",
		.placeholder = "<duration>",
		.description = "Metadata Synchronization Delay in ms, Default is 0. Quantized by\n5ms subframes for TDRenderer (13ms -> 10ms -> 2subframes)",
		},
		{
		.id = CmdLnOptionId_directivityPatternId,
		.match = "ism_directivity_pattern_id",
		.matchShort = "dpid",
		.placeholder = "<id1> [<id2>...]",
		.description = "Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated\nlist of up to 4 numbers (unsigned integers) can be specified for\nBINAURAL and BINAURAL_ROOM_REVERB output.\nID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\nISMs 1,2,3 and 4 respectively. \nThis option needs to be accompanied by a render_config file,\notherwise a default directivity pattern is used.",
		},
		{
		.id = CmdLnOptionId_acousticEnvironmentId,
		.match = "acoustic_environment_id",
		.matchShort = "aeid",
		.placeholder = "<id\|path>",
		.description = "Acoustic environment ID (number > 0) alternatively, it can be a text file where each line contains \"ID duration\" for BINAURAL_ROOM_REVERB output configuration.",
		},
		{
		.id = CmdLnOptionId_roomSize,
		.match = "room_size",
		.matchShort = "rsz",
		.description = "Selects default reverb based on a room size (S - small \| M - medium \| L - large)",
		.placeholder = "<size>",
		.description = "Selects default reverb based on a room size (S - small \|\nM - medium \| L - large)",
		}
		};

		@@ -1526,7 +1554,7 @@ int main(

		if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, outFile, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", outFile );
		fprintf( stderr, "\nError: Could not open split rend metadata file %s!\n", outFile );
		goto cleanup;
		}
		}
		@@ -2676,53 +2704,6 @@ static bool parseReverbRoomSize(
		return true;
		}


		static bool checkRequiredArgs(
		CmdlnArgs args )
		{
		const CmdLnParser_Option *tmpOption;

		/* Check required arguments */
		bool missingRequiredArg = false;
		if ( isEmptyString( args.inputFilePath ) )
		{
		tmpOption = findOptionById( CmdLnOptionId_inputFile );
		fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );
		missingRequiredArg = true;
		}

		const bool singleInputSpecified = args.inConfig.numAudioObjects != 0 \|\|
		args.inConfig.numAmbisonicsBuses != 0 \|\|
		args.inConfig.numMultiChannelBuses != 0 \|\|
		args.inConfig.numMasaBuses != 0;

		if ( !args.sceneDescriptionInput && !singleInputSpecified )
		{
		/* Neither scene description input nor single-type input was specified on command line */
		tmpOption = findOptionById( CmdLnOptionId_inputFormat );
		fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );
		missingRequiredArg = true;
		}
		if ( isEmptyString( args.outputFilePath ) )
		{
		tmpOption = findOptionById( CmdLnOptionId_outputFile );
		fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );
		missingRequiredArg = true;
		}
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_INVALID )
		{
		tmpOption = findOptionById( CmdLnOptionId_outputFormat );
		fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );
		missingRequiredArg = true;
		}
		if ( missingRequiredArg )
		{
		CmdLnParser_printUsage( args.executableName, cliOptions, numCliOptions );
		}

		return !missingRequiredArg;
		}

		static CmdlnArgs defaultArgs(
		const char *executableName )
		{
		@@ -2815,7 +2796,7 @@ static CmdlnArgs defaultArgs(
		return args;
		}

		static void parseOption(
		static int16_t parseOption(
		const int32_t optionId,
		char **optionValues,
		const int16_t numOptionValues,
		@@ -3001,7 +2982,7 @@ static void parseOption(
		break;
		}

		return;
		return 0;
		}

		static CmdlnArgs parseCmdlnArgs(
		@@ -3015,11 +2996,6 @@ static CmdlnArgs parseCmdlnArgs(
		exit( -1 ); /* Error printout handled by failing function */
		}

		if ( !checkRequiredArgs( args ) )
		{
		exit( -1 ); /* Error printout handled by failing function */
		}

		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		args.Opt_Headrotation = 1;