mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-10-31 08:51:55 +00:00 
			
		
		
		
	Merge branch 'master' into xsn/private_batch_api
This commit is contained in:
		| @@ -87,11 +87,11 @@ struct wav_header { | ||||
|     uint32_t data_size; | ||||
| }; | ||||
|  | ||||
| static void save_wav16(const std::string & fname, const std::vector<float> & data, int sample_rate) { | ||||
| static bool save_wav16(const std::string & fname, const std::vector<float> & data, int sample_rate) { | ||||
|     std::ofstream file(fname, std::ios::binary); | ||||
|     if (!file) { | ||||
|         LOG_ERR("%s: Failed to open file '%s' for writing", __func__, fname.c_str()); | ||||
|         return; | ||||
|         LOG_ERR("%s: Failed to open file '%s' for writing.\n", __func__, fname.c_str()); | ||||
|         return false; | ||||
|     } | ||||
|  | ||||
|     wav_header header; | ||||
| @@ -108,7 +108,7 @@ static void save_wav16(const std::string & fname, const std::vector<float> & dat | ||||
|         file.write(reinterpret_cast<const char*>(&pcm_sample), sizeof(pcm_sample)); | ||||
|     } | ||||
|  | ||||
|     file.close(); | ||||
|     return file.good(); | ||||
| } | ||||
|  | ||||
| static void fill_hann_window(int length, bool periodic, float * output) { | ||||
| @@ -536,6 +536,7 @@ static std::string audio_data_from_speaker(json speaker, const outetts_version t | ||||
| int main(int argc, char ** argv) { | ||||
|     common_params params; | ||||
|  | ||||
|     params.out_file = "output.wav"; | ||||
|     params.prompt = ""; | ||||
|  | ||||
|     params.n_predict = 4096; | ||||
| @@ -1061,8 +1062,6 @@ lovely<|t_0.56|><|code_start|><|634|><|596|><|1766|><|1556|><|1306|><|1285|><|14 | ||||
|     } | ||||
| #endif | ||||
|  | ||||
|     const std::string fname = "output.wav"; | ||||
|  | ||||
|     const int n_sr = 24000; // sampling rate | ||||
|  | ||||
|     // zero out first 0.25 seconds | ||||
| @@ -1073,12 +1072,16 @@ lovely<|t_0.56|><|code_start|><|634|><|596|><|1766|><|1556|><|1306|><|1285|><|14 | ||||
|     LOG_INF("%s: time for spectral ops: %.3f ms\n", __func__, (ggml_time_us() - t_spec_start) / 1000.0f); | ||||
|     LOG_INF("%s: total time:            %.3f ms\n", __func__, (ggml_time_us() - t_main_start) / 1000.0f); | ||||
|  | ||||
|     save_wav16(fname, audio, n_sr); | ||||
|     int retval = 0; | ||||
|  | ||||
|     LOG_INF("%s: audio written to file '%s'\n", __func__, fname.c_str()); | ||||
|     if (save_wav16(params.out_file, audio, n_sr)) { | ||||
|         LOG_INF("%s: audio written to file '%s'\n", __func__, params.out_file.c_str()); | ||||
|     } else { | ||||
|         retval = ENOENT; | ||||
|     } | ||||
|  | ||||
|     llama_batch_ext_free(batch); | ||||
|     llama_backend_free(); | ||||
|  | ||||
|     return 0; | ||||
|     return retval; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Xuan Son Nguyen
					Xuan Son Nguyen