Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

feat: Support MULAW audio encoding feat: Support MP3_64_KBPS audio encoding feat: Support timepointing via SSML <mark> tag #198

Merged
merged 2 commits into from Jul 28, 2020
Merged

feat: Support MULAW audio encoding feat: Support MP3_64_KBPS audio encoding feat: Support timepointing via SSML <mark> tag #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1e589
feat: Support MULAW audio encoding feat: Support MP3_64_KBPS audio en…
yoshi-automation Jul 28, 2020
33f7b1b
chore: allow proto interface changes
chingor13 Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ch/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStubSettings.java
View file
Open in desktop
Expand Up @@ -203,10 +203,10 @@ public static class Builder extends StubSettings.Builder<TextToSpeechStubSetting
.setInitialRetryDelay(Duration.ofMillis(100L))
.setRetryDelayMultiplier(1.3)
.setMaxRetryDelay(Duration.ofMillis(60000L))
.setInitialRpcTimeout(Duration.ofMillis(600000L))
.setInitialRpcTimeout(Duration.ofMillis(300000L))
.setRpcTimeoutMultiplier(1.0)
.setMaxRpcTimeout(Duration.ofMillis(600000L))
.setTotalTimeout(Duration.ofMillis(600000L))
.setMaxRpcTimeout(Duration.ofMillis(300000L))
.setTotalTimeout(Duration.ofMillis(300000L))
.build();
definitions.put("retry_policy_1_params", settings);
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
Expand Down
19 changes: 19 additions & 0 deletions proto-google-cloud-texttospeech-v1/clirr-ignored-differences.xml
View file
Open in desktop
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/texttospeech/v1/*OrBuilder</className>
<method>* get*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/texttospeech/v1/*OrBuilder</className>
<method>boolean contains*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/texttospeech/v1/*OrBuilder</className>
<method>boolean has*(*)</method>
</difference>
</differences>
19 changes: 19 additions & 0 deletions proto-google-cloud-texttospeech-v1beta1/clirr-ignored-differences.xml
View file
Open in desktop
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/texttospeech/v1beta1/*OrBuilder</className>
<method>* get*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/texttospeech/v1beta1/*OrBuilder</className>
<method>boolean contains*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/texttospeech/v1beta1/*OrBuilder</className>
<method>boolean has*(*)</method>
</difference>
</differences>
46 changes: 46 additions & 0 deletions ...xttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioEncoding.java
View file
Open in desktop
Expand Up @@ -60,6 +60,16 @@ public enum AudioEncoding implements com.google.protobuf.ProtocolMessageEnum {
* <code>MP3 = 2;</code>
*/
MP3(2),
/**
*
*
* <pre>
* MP3 at 64kbps.
* </pre>
*
* <code>MP3_64_KBPS = 4;</code>
*/
MP3_64_KBPS(4),
/**
*
*
Expand All @@ -73,6 +83,17 @@ public enum AudioEncoding implements com.google.protobuf.ProtocolMessageEnum {
* <code>OGG_OPUS = 3;</code>
*/
OGG_OPUS(3),
/**
*
*
* <pre>
* 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.
* </pre>
*
* <code>MULAW = 5;</code>
*/
MULAW(5),
UNRECOGNIZED(-1),
;

Expand Down Expand Up @@ -107,6 +128,16 @@ public enum AudioEncoding implements com.google.protobuf.ProtocolMessageEnum {
* <code>MP3 = 2;</code>
*/
public static final int MP3_VALUE = 2;
/**
*
*
* <pre>
* MP3 at 64kbps.
* </pre>
*
* <code>MP3_64_KBPS = 4;</code>
*/
public static final int MP3_64_KBPS_VALUE = 4;
/**
*
*
Expand All @@ -120,6 +151,17 @@ public enum AudioEncoding implements com.google.protobuf.ProtocolMessageEnum {
* <code>OGG_OPUS = 3;</code>
*/
public static final int OGG_OPUS_VALUE = 3;
/**
*
*
* <pre>
* 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.
* </pre>
*
* <code>MULAW = 5;</code>
*/
public static final int MULAW_VALUE = 5;

public final int getNumber() {
if (this == UNRECOGNIZED) {
Expand Down Expand Up @@ -151,8 +193,12 @@ public static AudioEncoding forNumber(int value) {
return LINEAR16;
case 2:
return MP3;
case 4:
return MP3_64_KBPS;
case 3:
return OGG_OPUS;
case 5:
return MULAW;
default:
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...tospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SsmlVoiceGender.java
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ public enum SsmlVoiceGender implements com.google.protobuf.ProtocolMessageEnum {
*
*
* <pre>
* A gender-neutral voice.
* A gender-neutral voice. This voice is not yet supported.
* </pre>
*
* <code>NEUTRAL = 3;</code>
Expand Down Expand Up @@ -114,7 +114,7 @@ public enum SsmlVoiceGender implements com.google.protobuf.ProtocolMessageEnum {
*
*
* <pre>
* A gender-neutral voice.
* A gender-neutral voice. This voice is not yet supported.
* </pre>
*
* <code>NEUTRAL = 3;</code>
Expand Down