@@ -352,27 +352,7 @@ struct SherpaOnnxOfflineStream {
352
352
: impl(std::move(p)) {}
353
353
};
354
354
355
- static sherpa_onnx::OfflineRecognizerConfig convertConfig (
356
- const SherpaOnnxOfflineRecognizerConfig *config);
357
-
358
- const SherpaOnnxOfflineRecognizer *SherpaOnnxCreateOfflineRecognizer (
359
- const SherpaOnnxOfflineRecognizerConfig *config) {
360
- sherpa_onnx::OfflineRecognizerConfig recognizer_config =
361
- convertConfig (config);
362
-
363
- if (!recognizer_config.Validate ()) {
364
- SHERPA_ONNX_LOGE (" Errors in config" );
365
- return nullptr ;
366
- }
367
-
368
- SherpaOnnxOfflineRecognizer *recognizer = new SherpaOnnxOfflineRecognizer;
369
-
370
- recognizer->impl =
371
- std::make_unique<sherpa_onnx::OfflineRecognizer>(recognizer_config);
372
-
373
- return recognizer;
374
- }
375
- sherpa_onnx::OfflineRecognizerConfig convertConfig (
355
+ static sherpa_onnx::OfflineRecognizerConfig GetOfflineRecognizerConfig (
376
356
const SherpaOnnxOfflineRecognizerConfig *config) {
377
357
sherpa_onnx::OfflineRecognizerConfig recognizer_config;
378
358
@@ -491,17 +471,39 @@ sherpa_onnx::OfflineRecognizerConfig convertConfig(
491
471
recognizer_config.rule_fars = SHERPA_ONNX_OR (config->rule_fars , " " );
492
472
493
473
if (config->model_config .debug ) {
474
+ #if __OHOS__
475
+ SHERPA_ONNX_LOGE (" %{public}s" , recognizer_config.ToString ().c_str ());
476
+ #else
494
477
SHERPA_ONNX_LOGE (" %s" , recognizer_config.ToString ().c_str ());
478
+ #endif
495
479
}
496
480
497
481
return recognizer_config;
498
482
}
499
483
484
+ const SherpaOnnxOfflineRecognizer *SherpaOnnxCreateOfflineRecognizer (
485
+ const SherpaOnnxOfflineRecognizerConfig *config) {
486
+ sherpa_onnx::OfflineRecognizerConfig recognizer_config =
487
+ GetOfflineRecognizerConfig (config);
488
+
489
+ if (!recognizer_config.Validate ()) {
490
+ SHERPA_ONNX_LOGE (" Errors in config" );
491
+ return nullptr ;
492
+ }
493
+
494
+ SherpaOnnxOfflineRecognizer *recognizer = new SherpaOnnxOfflineRecognizer;
495
+
496
+ recognizer->impl =
497
+ std::make_unique<sherpa_onnx::OfflineRecognizer>(recognizer_config);
498
+
499
+ return recognizer;
500
+ }
501
+
500
502
void SherpaOnnxOfflineRecognizerSetConfig (
501
503
const SherpaOnnxOfflineRecognizer *recognizer,
502
504
const SherpaOnnxOfflineRecognizerConfig *config) {
503
505
sherpa_onnx::OfflineRecognizerConfig recognizer_config =
504
- convertConfig (config);
506
+ GetOfflineRecognizerConfig (config);
505
507
recognizer->impl ->SetConfig (recognizer_config);
506
508
}
507
509
@@ -977,25 +979,6 @@ SherpaOnnxVoiceActivityDetector *SherpaOnnxCreateVoiceActivityDetector(
977
979
return p;
978
980
}
979
981
980
- #ifdef __OHOS__
981
- SherpaOnnxVoiceActivityDetector *SherpaOnnxCreateVoiceActivityDetectorOHOS (
982
- const SherpaOnnxVadModelConfig *config, float buffer_size_in_seconds,
983
- NativeResourceManager *mgr) {
984
- if (mgr == nullptr ) {
985
- return SherpaOnnxCreateVoiceActivityDetector (config,
986
- buffer_size_in_seconds);
987
- }
988
-
989
- auto vad_config = GetVadModelConfig (config);
990
-
991
- SherpaOnnxVoiceActivityDetector *p = new SherpaOnnxVoiceActivityDetector;
992
- p->impl = std::make_unique<sherpa_onnx::VoiceActivityDetector>(
993
- mgr, vad_config, buffer_size_in_seconds);
994
-
995
- return p;
996
- }
997
- #endif
998
-
999
982
void SherpaOnnxDestroyVoiceActivityDetector (
1000
983
SherpaOnnxVoiceActivityDetector *p) {
1001
984
delete p;
@@ -1891,4 +1874,42 @@ SherpaOnnxOfflineSpeakerDiarizationProcessWithCallbackNoArg(
1891
1874
return ans;
1892
1875
}
1893
1876
1877
+ #ifdef __OHOS__
1878
+
1879
+ const SherpaOnnxOfflineRecognizer *SherpaOnnxCreateOfflineRecognizerOHOS (
1880
+ const SherpaOnnxOfflineRecognizerConfig *config,
1881
+ NativeResourceManager *mgr) {
1882
+ if (mgr == nullptr ) {
1883
+ return SherpaOnnxCreateOfflineRecognizer (config);
1884
+ }
1885
+
1886
+ sherpa_onnx::OfflineRecognizerConfig recognizer_config =
1887
+ GetOfflineRecognizerConfig (config);
1888
+
1889
+ SherpaOnnxOfflineRecognizer *recognizer = new SherpaOnnxOfflineRecognizer;
1890
+
1891
+ recognizer->impl =
1892
+ std::make_unique<sherpa_onnx::OfflineRecognizer>(mgr, recognizer_config);
1893
+
1894
+ return recognizer;
1895
+ }
1896
+
1897
+ SherpaOnnxVoiceActivityDetector *SherpaOnnxCreateVoiceActivityDetectorOHOS (
1898
+ const SherpaOnnxVadModelConfig *config, float buffer_size_in_seconds,
1899
+ NativeResourceManager *mgr) {
1900
+ if (mgr == nullptr ) {
1901
+ return SherpaOnnxCreateVoiceActivityDetector (config,
1902
+ buffer_size_in_seconds);
1903
+ }
1904
+
1905
+ auto vad_config = GetVadModelConfig (config);
1906
+
1907
+ SherpaOnnxVoiceActivityDetector *p = new SherpaOnnxVoiceActivityDetector;
1908
+ p->impl = std::make_unique<sherpa_onnx::VoiceActivityDetector>(
1909
+ mgr, vad_config, buffer_size_in_seconds);
1910
+
1911
+ return p;
1912
+ }
1913
+ #endif
1914
+
1894
1915
#endif
0 commit comments