Enunu style support #1506

rokujyushi · 2025-04-21T22:24:37Z

EnunuConfig Extensions and Rendering Improvements

Added new properties and classes to EnunuConfig.cs to make the configuration more extensible. Modified the PhraseToEnunuNotes method to take EnunuConfig as an argument and added timbre construction logic using style_format. The GetSuggestedExpressions method has also been updated to properly load when the configuration is null. The Load method now has a condition to consider the unLoadSubBanks property, and EnunuUtils.cs now has UTF8 encoding.

Voice colours (strength, singing style) for the following sources are now loaded from config.yaml.
NNSVS/ENUNU　波音リツ CRISSCROSS　5スタイル #4130

extensions:
  ust_editor:
    - "%e/extensions/style_shifter.py"
    - "%v/flag_separator/flag_separator.py"
  timing_editor:
    - "%v/velocity_applier/velocity_applier.py"
    - "%v/timing_auto_correct/enunu_timing_auto_correct.py"
  acoustic_editor:
    - "%e/extensions/style_shifter.py"
  style_format:
    p9: 
      ldst: "{0}"
      loud: "{0}"
      nrml: "{0}"
      soft: "{0}"
    p16: 
      Std: "s{0}"
      swt: "s{0}"
      rock: "r{0}"
      brth: "b{0}"
      pop: "p{0}"
  styles:
    ldst:
      name: Loudest #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p9 #USTに書き込むフラグ
      
    loud:
      name: Loud #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p9 #USTに書き込むフラグ
      
    nrml:
      name: Normal #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p9 #USTに書き込むフラグ
      
    soft:
      name: Soft #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p9 #USTに書き込むフラグ
      
    Std:
      name: Standard #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p16 #USTに書き込むフラグ
      
    swt:
      name: Sweet #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p16 #USTに書き込むフラグ
      
    rock:
      name: Rock #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p16 #USTに書き込むフラグ
      
    brth:
      name: Breathy #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 6
      default_value: 0
      flag: p16 #USTに書き込むフラグ
      
    pop:
      name: Pop #OpenUtau表示名
      type: Numerical #フラグの操作コントロールの種類
      min: 0
      max: 3
      default_value: 0
      flag: p16 #USTに書き込むフラグ

An option to not read in voice colours from the question file has been added.

# Global configs
sample_rate: 48000
frame_period: 5
log_f0_conditioning: true
use_world_codec: true
feature_type: world
unload_subbanks: true

EnunuConfig Extensions and Rendering Improvements Added new properties and classes to `EnunuConfig.cs` to make the configuration more extensible. Modified the `PhraseToEnunuNotes` method to take `EnunuConfig` as an argument and added `timbre` construction logic using `style_format`. The `GetSuggestedExpressions` method has also been updated to properly load when the configuration is null. The `Load` method now has a condition to consider the `unLoadSubBanks` property, and `EnunuUtils.cs` now has `UTF8` encoding.

The lines `using System.Diagnostics;` and `using Vortice;` have been removed. This means that these namespaces are no longer used in this file.

Copilot

Pull Request Overview

This PR introduces Enunu style support by extending the Enunu configuration and updating rendering logic for improved style and subbank handling.

Extended EnunuConfig with new properties and parsing logic for style formats and expression details.
Modified rendering functions to pass configuration and incorporate style formatting in note generation.
Updated the singer loading logic to conditionally add subbanks based on the new configuration parameter.

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

File	Description
OpenUtau.Core/Enunu/EnunuUtils.cs	Added UTF8 encoding support.
OpenUtau.Core/Enunu/EnunuSinger.cs	Adjusted subbank addition logic to consider the unLoadSubBanks setting.
OpenUtau.Core/Enunu/EnunuRenderer.cs	Updated PhraseToEnunuNotes to accept a config parameter and fixed note style processing; added logic for generating suggested expressions.
OpenUtau.Core/Enunu/EnunuConfig.cs	Extended config to include unLoadSubBanks and parsing for style_format and styles.

Comments suppressed due to low confidence (2)

OpenUtau.Core/Enunu/EnunuConfig.cs:14

[nitpick] Consider renaming 'unLoadSubBanks' to 'UnloadSubBanks' to follow standard C# naming conventions for boolean properties.

public bool unLoadSubBanks = false;

OpenUtau.Core/Enunu/EnunuRenderer.cs:300

The variable 'config' is referenced in GetSuggestedExpressions without a clear declaration within the method or as a class member. Ensure that 'config' is properly defined or passed to the method to avoid runtime errors.

if(config == null) {

Copilot · 2025-04-21T22:25:14Z

OpenUtau.Core/Enunu/EnunuRenderer.cs

+                    }
+                }
+                timbre += result;
+                timbre = timbre.TrimEnd('/');


The 'timbre' variable is declared outside the phone loop and is not reset for each iteration, which may lead to unintended accumulation of style values. Consider initializing 'timbre' inside the loop for each phone.

The AI seems to have a point?

@stakira
The timbre is assigned a style setting for each suffix and voicebank.
The style settings are assembled in lines 254 to 284 and the result is assigned to result.
The result is appended to timbre at line 280.
As timbre is set to EnunuNote (phoneme), timbre is initialised at line 255 each time an EnunuNote is created.

…nfig は各メソッド内でのみ有効となり、クラス全体の状態を持たなくなりました。Render や GetSuggestedExpressions メソッド内で config を初期化するよう修正し、コードのスコープが明確化されました。

rokujyushi · 2025-04-24T22:00:18Z

Corrected the way format is specified.

extensions:
  style_format:
    p9: 
      format: "{0}{1}{2}{3}"
      index: [ldst, loud, nrml, soft]
    p16: 
      format: "s{0}s{1}r{2}b{3}p{4}"
      index: [Std, swt, rock, brth, pop]

…log out singer names and voicebank hashes.

Copilot

Pull Request Overview

This PR enhances Enunu configuration and rendering by introducing style support, updated configuration handling, and improved encoding support. Key changes include adding a UTF8 encoding constant, updating subbank loading logic based on a new configuration flag, refactoring the PhraseToEnunuNotes method to use the latest configuration, and expanding the EnunuConfig parser to support new style format and expression properties.

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File	Description
OpenUtau.Core/Enunu/EnunuUtils.cs	Added a UTF8 encoding constant to support flexible text encoding.
OpenUtau.Core/Enunu/EnunuSinger.cs	Modified subbanks loading condition to honor the enuconfig.unLoadSubBanks flag.
OpenUtau.Core/Enunu/EnunuRenderer.cs	Updated configuration handling in PhraseToEnunuNotes and GetSuggestedExpressions; removed unused field.
OpenUtau.Core/Enunu/EnunuConfig.cs	Added a new unLoadSubBanks property and extended parsing functionality for style_format and styles.

Comments suppressed due to low confidence (2)

OpenUtau.Core/Enunu/EnunuRenderer.cs:304

Returning null from GetSuggestedExpressions may force callers to perform extra null checks; consider returning an empty array for a more consistent API.

if (ensinger == null) { return null; }

OpenUtau.Core/Enunu/EnunuConfig.cs:206

Overwriting the flag variable within ParseEnunuStyleFormat may inadvertently discard valid entries if extra keys are present. Consider checking for required keys without unconditionally resetting the flag.

else { flag = false; }

OpenUtau.Core/Enunu/EnunuUtils.cs

OpenUtau.Core/Enunu/EnunuRenderer.cs

Co-authored-by: Copilot <[email protected]>

…penUtau into Enunu_Style_Support

The addition of values to `part` variables has been changed from the `=` operator to the `+=` operator. This fixes a problem where the flag key was not included.

Removed the `config` field.

rokujyushi added 2 commits April 22, 2025 07:15

Removing unnecessary namespaces.

d6d95a1

The lines `using System.Diagnostics;` and `using Vortice;` have been removed. This means that these namespaces are no longer used in this file.

Copilot AI review requested due to automatic review settings April 21, 2025 22:24

Copilot AI reviewed Apr 21, 2025

View reviewed changes

rokujyushi marked this pull request as draft April 24, 2025 21:39

Change the way styles are specified.

623b8ed

Serilog has been added to EnunuPhonemizer.cs and EnunuRenderer.cs to …

5ed4373

…log out singer names and voicebank hashes.

rokujyushi marked this pull request as ready for review April 30, 2025 17:31

rokujyushi requested a review from Copilot April 30, 2025 17:31

Copilot AI reviewed Apr 30, 2025

View reviewed changes

OpenUtau.Core/Enunu/EnunuUtils.cs Outdated Show resolved Hide resolved

OpenUtau.Core/Enunu/EnunuRenderer.cs Outdated Show resolved Hide resolved

rokujyushi and others added 7 commits May 8, 2025 01:33

Update OpenUtau.Core/Enunu/EnunuUtils.cs

2137991

Co-authored-by: Copilot <[email protected]>

Update OpenUtau.Core/Enunu/EnunuRenderer.cs

e6c1ca5

Co-authored-by: Copilot <[email protected]>

Organise initialisation points for editing.

d419d0e

Merge branch 'Enunu_Style_Support' of https://github.com/rokujyushi/O…

599b0e6

…penUtau into Enunu_Style_Support

Fixed method of adding values to part variables

89fd0d4

The addition of values to `part` variables has been changed from the `=` operator to the `+=` operator. This fixes a problem where the flag key was not included.

Merge branch 'master' into Enunu_Style_Support

19990c6

Cleaned up EnunuRenderer fields.

f1b2e76

Removed the `config` field.

stakira merged commit 2cc5a4e into stakira:master May 21, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Enunu style support #1506

Enunu style support #1506

Uh oh!

rokujyushi commented Apr 21, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 21, 2025

Uh oh!

stakira May 7, 2025

Uh oh!

rokujyushi May 7, 2025 •

edited

Loading

Uh oh!

rokujyushi commented Apr 24, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Enunu style support #1506

Enunu style support #1506

Uh oh!

Conversation

rokujyushi commented Apr 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Apr 21, 2025

Choose a reason for hiding this comment

Uh oh!

stakira May 7, 2025

Choose a reason for hiding this comment

Uh oh!

rokujyushi May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rokujyushi commented Apr 24, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rokujyushi commented Apr 21, 2025 •

edited

Loading

rokujyushi May 7, 2025 •

edited

Loading