diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java b/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java index 8c504f5d..4f40b335 100644 --- a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java +++ b/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java @@ -208,10 +208,10 @@ public static class Builder extends StubSettings.BuilderOGG_OPUS = 3; */ OGG_OPUS(3), + /** + * + * + * 
+   * 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law.
+   * Audio content returned as MULAW also contains a WAV header.
+   *
+ * + * MULAW = 5; + */ + MULAW(5), + /** + * + * + * 
+   * 8-bit samples that compand 14-bit audio samples using G.711 PCMU/A-law.
+   * Audio content returned as ALAW also contains a WAV header.
+   *
+ * + * ALAW = 6; + */ + ALAW(6), UNRECOGNIZED(-1), ; @@ -120,6 +142,28 @@ public enum AudioEncoding implements com.google.protobuf.ProtocolMessageEnum { * OGG_OPUS = 3; */ public static final int OGG_OPUS_VALUE = 3; + /** + * + * + * 
+   * 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law.
+   * Audio content returned as MULAW also contains a WAV header.
+   *
+ * + * MULAW = 5; + */ + public static final int MULAW_VALUE = 5; + /** + * + * + * 
+   * 8-bit samples that compand 14-bit audio samples using G.711 PCMU/A-law.
+   * Audio content returned as ALAW also contains a WAV header.
+   *
+ * + * ALAW = 6; + */ + public static final int ALAW_VALUE = 6; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -153,6 +197,10 @@ public static AudioEncoding forNumber(int value) { return MP3; case 3: return OGG_OPUS; + case 5: + return MULAW; + case 6: + return ALAW; default: return null; } diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java index 1ba3b87a..a0a37bdc 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java @@ -67,7 +67,7 @@ public enum SsmlVoiceGender implements com.google.protobuf.ProtocolMessageEnum { * * * 
-   * A gender-neutral voice.
+   * A gender-neutral voice. This voice is not yet supported.
    *
* * NEUTRAL = 3; @@ -114,7 +114,7 @@ public enum SsmlVoiceGender implements com.google.protobuf.ProtocolMessageEnum { * * * 
-   * A gender-neutral voice.
+   * A gender-neutral voice. This voice is not yet supported.
    *
* * NEUTRAL = 3; diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java index 2d8ecdd1..a5507e30 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java @@ -72,53 +72,56 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".proto\022\034google.cloud.texttospeech.v1\032\034go" + "ogle/api/annotations.proto\032\027google/api/c" + "lient.proto\032\037google/api/field_behavior.p" - + "roto\"/\n\021ListVoicesRequest\022\032\n\rlanguage_co" - + "de\030\001 \001(\tB\003\340A\001\"I\n\022ListVoicesResponse\0223\n\006v" - + "oices\030\001 \003(\0132#.google.cloud.texttospeech." - + "v1.Voice\"\224\001\n\005Voice\022\026\n\016language_codes\030\001 \003" - + "(\t\022\014\n\004name\030\002 \001(\t\022B\n\013ssml_gender\030\003 \001(\0162-." - + "google.cloud.texttospeech.v1.SsmlVoiceGe" - + "nder\022!\n\031natural_sample_rate_hertz\030\004 \001(\005\"" - + "\351\001\n\027SynthesizeSpeechRequest\022@\n\005input\030\001 \001" - + "(\0132,.google.cloud.texttospeech.v1.Synthe" - + "sisInputB\003\340A\002\022F\n\005voice\030\002 \001(\01322.google.cl" - + "oud.texttospeech.v1.VoiceSelectionParams" - + "B\003\340A\002\022D\n\014audio_config\030\003 \001(\0132).google.clo" - + "ud.texttospeech.v1.AudioConfigB\003\340A\002\"@\n\016S" - + "ynthesisInput\022\016\n\004text\030\001 \001(\tH\000\022\016\n\004ssml\030\002 " - + "\001(\tH\000B\016\n\014input_source\"\204\001\n\024VoiceSelection" - + "Params\022\032\n\rlanguage_code\030\001 \001(\tB\003\340A\002\022\014\n\004na" - + "me\030\002 \001(\t\022B\n\013ssml_gender\030\003 \001(\0162-.google.c" - + "loud.texttospeech.v1.SsmlVoiceGender\"\361\001\n" - + "\013AudioConfig\022H\n\016audio_encoding\030\001 \001(\0162+.g" - + "oogle.cloud.texttospeech.v1.AudioEncodin" - + "gB\003\340A\002\022\035\n\rspeaking_rate\030\002 \001(\001B\006\340A\004\340A\001\022\025\n" - + "\005pitch\030\003 \001(\001B\006\340A\004\340A\001\022\036\n\016volume_gain_db\030\004" - + " \001(\001B\006\340A\004\340A\001\022\036\n\021sample_rate_hertz\030\005 \001(\005B" - + "\003\340A\001\022\"\n\022effects_profile_id\030\006 \003(\tB\006\340A\004\340A\001" - + "\"1\n\030SynthesizeSpeechResponse\022\025\n\raudio_co" - + "ntent\030\001 \001(\014*W\n\017SsmlVoiceGender\022!\n\035SSML_V" - + "OICE_GENDER_UNSPECIFIED\020\000\022\010\n\004MALE\020\001\022\n\n\006F" - + "EMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudioEncoding\022\036\n" - + "\032AUDIO_ENCODING_UNSPECIFIED\020\000\022\014\n\010LINEAR1" - + "6\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\264\003\n\014TextToSpe" - + "ech\022\223\001\n\nListVoices\022/.google.cloud.textto" - + "speech.v1.ListVoicesRequest\0320.google.clo" - + "ud.texttospeech.v1.ListVoicesResponse\"\"\202" - + "\323\344\223\002\014\022\n/v1/voices\332A\rlanguage_code\022\274\001\n\020Sy" - + "nthesizeSpeech\0225.google.cloud.texttospee" - + "ch.v1.SynthesizeSpeechRequest\0326.google.c" - + "loud.texttospeech.v1.SynthesizeSpeechRes" - + "ponse\"9\202\323\344\223\002\030\"\023/v1/text:synthesize:\001*\332A\030" - + "input,voice,audio_config\032O\312A\033texttospeec" - + "h.googleapis.com\322A.https://www.googleapi" - + "s.com/auth/cloud-platformB\344\001\n com.google" - + ".cloud.texttospeech.v1B\021TextToSpeechProt" - + "oP\001ZHgoogle.golang.org/genproto/googleap" - + "is/cloud/texttospeech/v1;texttospeech\370\001\001" - + "\252\002\034Google.Cloud.TextToSpeech.V1\312\002\034Google" - + "\\Cloud\\TextToSpeech\\V1\352\002\037Google::Cloud::" - + "TextToSpeech::V1b\006proto3" + + "roto\032\031google/api/resource.proto\"/\n\021ListV" + + "oicesRequest\022\032\n\rlanguage_code\030\001 \001(\tB\003\340A\001" + + "\"I\n\022ListVoicesResponse\0223\n\006voices\030\001 \003(\0132#" + + ".google.cloud.texttospeech.v1.Voice\"\224\001\n\005" + + "Voice\022\026\n\016language_codes\030\001 \003(\t\022\014\n\004name\030\002 " + + "\001(\t\022B\n\013ssml_gender\030\003 \001(\0162-.google.cloud." + + "texttospeech.v1.SsmlVoiceGender\022!\n\031natur" + + "al_sample_rate_hertz\030\004 \001(\005\"\351\001\n\027Synthesiz" + + "eSpeechRequest\022@\n\005input\030\001 \001(\0132,.google.c" + + "loud.texttospeech.v1.SynthesisInputB\003\340A\002" + + "\022F\n\005voice\030\002 \001(\01322.google.cloud.texttospe" + + "ech.v1.VoiceSelectionParamsB\003\340A\002\022D\n\014audi" + + "o_config\030\003 \001(\0132).google.cloud.texttospee" + + "ch.v1.AudioConfigB\003\340A\002\"@\n\016SynthesisInput" + + "\022\016\n\004text\030\001 \001(\tH\000\022\016\n\004ssml\030\002 \001(\tH\000B\016\n\014inpu" + + "t_source\"\204\001\n\024VoiceSelectionParams\022\032\n\rlan" + + "guage_code\030\001 \001(\tB\003\340A\002\022\014\n\004name\030\002 \001(\t\022B\n\013s" + + "sml_gender\030\003 \001(\0162-.google.cloud.texttosp" + + "eech.v1.SsmlVoiceGender\"\361\001\n\013AudioConfig\022" + + "H\n\016audio_encoding\030\001 \001(\0162+.google.cloud.t" + + "exttospeech.v1.AudioEncodingB\003\340A\002\022\035\n\rspe" + + "aking_rate\030\002 \001(\001B\006\340A\004\340A\001\022\025\n\005pitch\030\003 \001(\001B" + + "\006\340A\004\340A\001\022\036\n\016volume_gain_db\030\004 \001(\001B\006\340A\004\340A\001\022" + + "\036\n\021sample_rate_hertz\030\005 \001(\005B\003\340A\001\022\"\n\022effec" + + "ts_profile_id\030\006 \003(\tB\006\340A\004\340A\001\"1\n\030Synthesiz" + + "eSpeechResponse\022\025\n\raudio_content\030\001 \001(\014*W" + + "\n\017SsmlVoiceGender\022!\n\035SSML_VOICE_GENDER_U" + + "NSPECIFIED\020\000\022\010\n\004MALE\020\001\022\n\n\006FEMALE\020\002\022\013\n\007NE" + + "UTRAL\020\003*i\n\rAudioEncoding\022\036\n\032AUDIO_ENCODI" + + "NG_UNSPECIFIED\020\000\022\014\n\010LINEAR16\020\001\022\007\n\003MP3\020\002\022" + + "\014\n\010OGG_OPUS\020\003\022\t\n\005MULAW\020\005\022\010\n\004ALAW\020\0062\264\003\n\014T" + + "extToSpeech\022\223\001\n\nListVoices\022/.google.clou" + + "d.texttospeech.v1.ListVoicesRequest\0320.go" + + "ogle.cloud.texttospeech.v1.ListVoicesRes" + + "ponse\"\"\202\323\344\223\002\014\022\n/v1/voices\332A\rlanguage_cod" + + "e\022\274\001\n\020SynthesizeSpeech\0225.google.cloud.te" + + "xttospeech.v1.SynthesizeSpeechRequest\0326." + + "google.cloud.texttospeech.v1.SynthesizeS" + + "peechResponse\"9\202\323\344\223\002\030\"\023/v1/text:synthesi" + + "ze:\001*\332A\030input,voice,audio_config\032O\312A\033tex" + + "ttospeech.googleapis.com\322A.https://www.g" + + "oogleapis.com/auth/cloud-platformB\274\002\n co" + + "m.google.cloud.texttospeech.v1B\021TextToSp" + + "eechProtoP\001ZHgoogle.golang.org/genproto/" + + "googleapis/cloud/texttospeech/v1;texttos" + + "peech\370\001\001\252\002\034Google.Cloud.TextToSpeech.V1\312" + + "\002\034Google\\Cloud\\TextToSpeech\\V1\352\002\037Google:" + + ":Cloud::TextToSpeech::V1\352AU\n\033automl.goog" + + "leapis.com/Model\0226projects/{project}/loc" + + "ations/{location}/models/{model}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -127,6 +130,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.api.AnnotationsProto.getDescriptor(), com.google.api.ClientProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), + com.google.api.ResourceProto.getDescriptor(), }); internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -204,11 +208,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.methodSignature); registry.add(com.google.api.ClientProto.oauthScopes); + registry.add(com.google.api.ResourceProto.resourceDefinition); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); com.google.api.ClientProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); + com.google.api.ResourceProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto b/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto index 7eec1ef4..a10bfe60 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto +++ b/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC. +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,7 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// syntax = "proto3"; @@ -20,6 +19,7 @@ package google.cloud.texttospeech.v1; import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.TextToSpeech.V1"; @@ -29,6 +29,10 @@ option java_outer_classname = "TextToSpeechProto"; option java_package = "com.google.cloud.texttospeech.v1"; option php_namespace = "Google\\Cloud\\TextToSpeech\\V1"; option ruby_package = "Google::Cloud::TextToSpeech::V1"; +option (google.api.resource_definition) = { + type: "automl.googleapis.com/Model" + pattern: "projects/{project}/locations/{location}/models/{model}" +}; // Service that implements Google Cloud Text-to-Speech API. service TextToSpeech { @@ -83,7 +87,7 @@ enum SsmlVoiceGender { // A female voice. FEMALE = 2; - // A gender-neutral voice. + // A gender-neutral voice. This voice is not yet supported. NEUTRAL = 3; } @@ -105,6 +109,14 @@ enum AudioEncoding { // Chrome and Firefox). The quality of the encoding is considerably higher // than MP3 while using approximately the same bitrate. OGG_OPUS = 3; + + // 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law. + // Audio content returned as MULAW also contains a WAV header. + MULAW = 5; + + // 8-bit samples that compand 14-bit audio samples using G.711 PCMU/A-law. + // Audio content returned as ALAW also contains a WAV header. + ALAW = 6; } // The message returned to the client by the `ListVoices` method.