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

Commit 342dcfb

Browse files
docs: updated comments to match API behaviors (#52)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 449874412 Source-Link: googleapis/googleapis@4c6f583 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ead9c4d1cb0cabf095b446c9988a1855a2cbb1db Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWFkOWM0ZDFjYjBjYWJmMDk1YjQ0NmM5OTg4YTE4NTVhMmNiYjFkYiJ9
1 parent aecb6c5 commit 342dcfb

File tree

9 files changed

+215
-198
lines changed

9 files changed

+215
-198
lines changed

proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Channel.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum {
355355
*
356356
*
357357
* <pre>
358-
* Channel is waiting for the input stream through the input. Live streams
359-
* do not start yet.
358+
* Channel is waiting for the input stream through the input.
360359
* </pre>
361360
*
362361
* <code>AWAITING_INPUT = 2;</code>
@@ -380,6 +379,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum {
380379
* <pre>
381380
* Channel is generating live streams with no input stream. Live streams are
382381
* filled out with black screen, while input stream is missing.
382+
* Not supported yet.
383383
* </pre>
384384
*
385385
* <code>STREAMING_NO_INPUT = 5;</code>
@@ -443,8 +443,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum {
443443
*
444444
*
445445
* <pre>
446-
* Channel is waiting for the input stream through the input. Live streams
447-
* do not start yet.
446+
* Channel is waiting for the input stream through the input.
448447
* </pre>
449448
*
450449
* <code>AWAITING_INPUT = 2;</code>
@@ -468,6 +467,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum {
468467
* <pre>
469468
* Channel is generating live streams with no input stream. Live streams are
470469
* filled out with black screen, while input stream is missing.
470+
* Not supported yet.
471471
* </pre>
472472
*
473473
* <code>STREAMING_NO_INPUT = 5;</code>

proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Event.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,16 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
300300
* <code>PENDING = 5;</code>
301301
*/
302302
PENDING(5),
303+
/**
304+
*
305+
*
306+
* <pre>
307+
* Event was stopped before running for its full duration.
308+
* </pre>
309+
*
310+
* <code>STOPPED = 6;</code>
311+
*/
312+
STOPPED(6),
303313
UNRECOGNIZED(-1),
304314
;
305315

@@ -363,6 +373,16 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
363373
* <code>PENDING = 5;</code>
364374
*/
365375
public static final int PENDING_VALUE = 5;
376+
/**
377+
*
378+
*
379+
* <pre>
380+
* Event was stopped before running for its full duration.
381+
* </pre>
382+
*
383+
* <code>STOPPED = 6;</code>
384+
*/
385+
public static final int STOPPED_VALUE = 6;
366386

367387
public final int getNumber() {
368388
if (this == UNRECOGNIZED) {
@@ -400,6 +420,8 @@ public static State forNumber(int value) {
400420
return FAILED;
401421
case 5:
402422
return PENDING;
423+
case 6:
424+
return STOPPED;
403425
default:
404426
return null;
405427
}

proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Manifest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public com.google.protobuf.ByteString getMuxStreamsBytes(int index) {
494494
* Maximum number of segments that this manifest holds. Once the manifest
495495
* reaches this maximum number of segments, whenever a new segment is added to
496496
* the manifest, the oldest segment will be removed from the manifest.
497-
* The minimum value is 1 and the default value is 5.
497+
* The minimum value is 3 and the default value is 5.
498498
* </pre>
499499
*
500500
* <code>int32 max_segment_count = 4;</code>
@@ -1414,7 +1414,7 @@ public Builder addMuxStreamsBytes(com.google.protobuf.ByteString value) {
14141414
* Maximum number of segments that this manifest holds. Once the manifest
14151415
* reaches this maximum number of segments, whenever a new segment is added to
14161416
* the manifest, the oldest segment will be removed from the manifest.
1417-
* The minimum value is 1 and the default value is 5.
1417+
* The minimum value is 3 and the default value is 5.
14181418
* </pre>
14191419
*
14201420
* <code>int32 max_segment_count = 4;</code>
@@ -1432,7 +1432,7 @@ public int getMaxSegmentCount() {
14321432
* Maximum number of segments that this manifest holds. Once the manifest
14331433
* reaches this maximum number of segments, whenever a new segment is added to
14341434
* the manifest, the oldest segment will be removed from the manifest.
1435-
* The minimum value is 1 and the default value is 5.
1435+
* The minimum value is 3 and the default value is 5.
14361436
* </pre>
14371437
*
14381438
* <code>int32 max_segment_count = 4;</code>
@@ -1453,7 +1453,7 @@ public Builder setMaxSegmentCount(int value) {
14531453
* Maximum number of segments that this manifest holds. Once the manifest
14541454
* reaches this maximum number of segments, whenever a new segment is added to
14551455
* the manifest, the oldest segment will be removed from the manifest.
1456-
* The minimum value is 1 and the default value is 5.
1456+
* The minimum value is 3 and the default value is 5.
14571457
* </pre>
14581458
*
14591459
* <code>int32 max_segment_count = 4;</code>

proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ManifestOrBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public interface ManifestOrBuilder
155155
* Maximum number of segments that this manifest holds. Once the manifest
156156
* reaches this maximum number of segments, whenever a new segment is added to
157157
* the manifest, the oldest segment will be removed from the manifest.
158-
* The minimum value is 1 and the default value is 5.
158+
* The minimum value is 3 and the default value is 5.
159159
* </pre>
160160
*
161161
* <code>int32 max_segment_count = 4;</code>

proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/OutputsProto.java

Lines changed: 65 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -90,78 +90,76 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
9090
java.lang.String[] descriptorData = {
9191
"\n.google/cloud/video/livestream/v1/outpu"
9292
+ "ts.proto\022 google.cloud.video.livestream."
93-
+ "v1\032\034google/api/annotations.proto\032\037google"
94-
+ "/api/field_behavior.proto\032\036google/protob"
95-
+ "uf/duration.proto\"\207\002\n\020ElementaryStream\022\013"
96-
+ "\n\003key\030\004 \001(\t\022E\n\014video_stream\030\001 \001(\0132-.goog"
97-
+ "le.cloud.video.livestream.v1.VideoStream"
98-
+ "H\000\022E\n\014audio_stream\030\002 \001(\0132-.google.cloud."
99-
+ "video.livestream.v1.AudioStreamH\000\022C\n\013tex"
100-
+ "t_stream\030\003 \001(\0132,.google.cloud.video.live"
101-
+ "stream.v1.TextStreamH\000B\023\n\021elementary_str"
102-
+ "eam\"\224\001\n\tMuxStream\022\013\n\003key\030\001 \001(\t\022\021\n\tcontai"
103-
+ "ner\030\003 \001(\t\022\032\n\022elementary_streams\030\004 \003(\t\022K\n"
104-
+ "\020segment_settings\030\005 \001(\01321.google.cloud.v"
105-
+ "ideo.livestream.v1.SegmentSettings\"\232\002\n\010M"
106-
+ "anifest\022\021\n\tfile_name\030\001 \001(\t\022J\n\004type\030\002 \001(\016"
107-
+ "27.google.cloud.video.livestream.v1.Mani"
108-
+ "fest.ManifestTypeB\003\340A\002\022\030\n\013mux_streams\030\003 "
109-
+ "\003(\tB\003\340A\002\022\031\n\021max_segment_count\030\004 \001(\005\0228\n\025s"
110-
+ "egment_keep_duration\030\005 \001(\0132\031.google.prot"
111-
+ "obuf.Duration\"@\n\014ManifestType\022\035\n\031MANIFES"
112-
+ "T_TYPE_UNSPECIFIED\020\000\022\007\n\003HLS\020\001\022\010\n\004DASH\020\002\""
113-
+ "\343\001\n\013SpriteSheet\022\016\n\006format\030\001 \001(\t\022\030\n\013file_"
114-
+ "prefix\030\002 \001(\tB\003\340A\002\022 \n\023sprite_width_pixels"
115-
+ "\030\003 \001(\005B\003\340A\002\022!\n\024sprite_height_pixels\030\004 \001("
116-
+ "\005B\003\340A\002\022\024\n\014column_count\030\005 \001(\005\022\021\n\trow_coun"
117-
+ "t\030\006 \001(\005\022+\n\010interval\030\007 \001(\0132\031.google.proto"
118-
+ "buf.Duration\022\017\n\007quality\030\010 \001(\005\"\342\002\n\023Prepro"
119-
+ "cessingConfig\022H\n\004crop\030\002 \001(\0132:.google.clo"
120-
+ "ud.video.livestream.v1.PreprocessingConf"
121-
+ "ig.Crop\022F\n\003pad\030\003 \001(\01329.google.cloud.vide"
122-
+ "o.livestream.v1.PreprocessingConfig.Pad\032"
123-
+ "\\\n\004Crop\022\022\n\ntop_pixels\030\001 \001(\005\022\025\n\rbottom_pi"
124-
+ "xels\030\002 \001(\005\022\023\n\013left_pixels\030\003 \001(\005\022\024\n\014right"
125-
+ "_pixels\030\004 \001(\005\032[\n\003Pad\022\022\n\ntop_pixels\030\001 \001(\005"
126-
+ "\022\025\n\rbottom_pixels\030\002 \001(\005\022\023\n\013left_pixels\030\003"
127-
+ " \001(\005\022\024\n\014right_pixels\030\004 \001(\005\"\377\003\n\013VideoStre"
128-
+ "am\022O\n\004h264\030\024 \001(\0132?.google.cloud.video.li"
129-
+ "vestream.v1.VideoStream.H264CodecSetting"
130-
+ "sH\000\032\214\003\n\021H264CodecSettings\022\024\n\014width_pixel"
131-
+ "s\030\001 \001(\005\022\025\n\rheight_pixels\030\002 \001(\005\022\027\n\nframe_"
132-
+ "rate\030\003 \001(\001B\003\340A\002\022\030\n\013bitrate_bps\030\004 \001(\005B\003\340A"
133-
+ "\002\022\026\n\016allow_open_gop\030\006 \001(\010\022\031\n\017gop_frame_c"
134-
+ "ount\030\007 \001(\005H\000\0221\n\014gop_duration\030\010 \001(\0132\031.goo"
135-
+ "gle.protobuf.DurationH\000\022\025\n\rvbv_size_bits"
136-
+ "\030\t \001(\005\022\031\n\021vbv_fullness_bits\030\n \001(\005\022\025\n\rent"
137-
+ "ropy_coder\030\013 \001(\t\022\021\n\tb_pyramid\030\014 \001(\010\022\025\n\rb"
138-
+ "_frame_count\030\r \001(\005\022\023\n\013aq_strength\030\016 \001(\001\022"
139-
+ "\017\n\007profile\030\017 \001(\t\022\014\n\004tune\030\020 \001(\tB\n\n\010gop_mo"
140-
+ "deB\020\n\016codec_settings\"\332\002\n\013AudioStream\022\020\n\010"
141-
+ "transmux\030\010 \001(\010\022\r\n\005codec\030\001 \001(\t\022\030\n\013bitrate"
142-
+ "_bps\030\002 \001(\005B\003\340A\002\022\025\n\rchannel_count\030\003 \001(\005\022\026"
143-
+ "\n\016channel_layout\030\004 \003(\t\022K\n\007mapping\030\005 \003(\0132"
144-
+ ":.google.cloud.video.livestream.v1.Audio"
145-
+ "Stream.AudioMapping\022\031\n\021sample_rate_hertz"
146-
+ "\030\006 \001(\005\032y\n\014AudioMapping\022\026\n\tinput_key\030\006 \001("
147-
+ "\tB\003\340A\002\022\030\n\013input_track\030\002 \001(\005B\003\340A\002\022\032\n\rinpu"
148-
+ "t_channel\030\003 \001(\005B\003\340A\002\022\033\n\016output_channel\030\004"
149-
+ " \001(\005B\003\340A\002\" \n\nTextStream\022\022\n\005codec\030\001 \001(\tB\003"
150-
+ "\340A\002\"F\n\017SegmentSettings\0223\n\020segment_durati"
151-
+ "on\030\001 \001(\0132\031.google.protobuf.DurationB\357\001\n$"
152-
+ "com.google.cloud.video.livestream.v1B\014Ou"
153-
+ "tputsProtoP\001ZJgoogle.golang.org/genproto"
154-
+ "/googleapis/cloud/video/livestream/v1;li"
155-
+ "vestream\252\002 Google.Cloud.Video.LiveStream"
156-
+ ".V1\312\002 Google\\Cloud\\Video\\LiveStream\\V1\352\002"
157-
+ "$Google::Cloud::Video::LiveStream::V1b\006p"
158-
+ "roto3"
93+
+ "v1\032\037google/api/field_behavior.proto\032\036goo"
94+
+ "gle/protobuf/duration.proto\"\207\002\n\020Elementa"
95+
+ "ryStream\022\013\n\003key\030\004 \001(\t\022E\n\014video_stream\030\001 "
96+
+ "\001(\0132-.google.cloud.video.livestream.v1.V"
97+
+ "ideoStreamH\000\022E\n\014audio_stream\030\002 \001(\0132-.goo"
98+
+ "gle.cloud.video.livestream.v1.AudioStrea"
99+
+ "mH\000\022C\n\013text_stream\030\003 \001(\0132,.google.cloud."
100+
+ "video.livestream.v1.TextStreamH\000B\023\n\021elem"
101+
+ "entary_stream\"\224\001\n\tMuxStream\022\013\n\003key\030\001 \001(\t"
102+
+ "\022\021\n\tcontainer\030\003 \001(\t\022\032\n\022elementary_stream"
103+
+ "s\030\004 \003(\t\022K\n\020segment_settings\030\005 \001(\01321.goog"
104+
+ "le.cloud.video.livestream.v1.SegmentSett"
105+
+ "ings\"\232\002\n\010Manifest\022\021\n\tfile_name\030\001 \001(\t\022J\n\004"
106+
+ "type\030\002 \001(\01627.google.cloud.video.livestre"
107+
+ "am.v1.Manifest.ManifestTypeB\003\340A\002\022\030\n\013mux_"
108+
+ "streams\030\003 \003(\tB\003\340A\002\022\031\n\021max_segment_count\030"
109+
+ "\004 \001(\005\0228\n\025segment_keep_duration\030\005 \001(\0132\031.g"
110+
+ "oogle.protobuf.Duration\"@\n\014ManifestType\022"
111+
+ "\035\n\031MANIFEST_TYPE_UNSPECIFIED\020\000\022\007\n\003HLS\020\001\022"
112+
+ "\010\n\004DASH\020\002\"\343\001\n\013SpriteSheet\022\016\n\006format\030\001 \001("
113+
+ "\t\022\030\n\013file_prefix\030\002 \001(\tB\003\340A\002\022 \n\023sprite_wi"
114+
+ "dth_pixels\030\003 \001(\005B\003\340A\002\022!\n\024sprite_height_p"
115+
+ "ixels\030\004 \001(\005B\003\340A\002\022\024\n\014column_count\030\005 \001(\005\022\021"
116+
+ "\n\trow_count\030\006 \001(\005\022+\n\010interval\030\007 \001(\0132\031.go"
117+
+ "ogle.protobuf.Duration\022\017\n\007quality\030\010 \001(\005\""
118+
+ "\342\002\n\023PreprocessingConfig\022H\n\004crop\030\002 \001(\0132:."
119+
+ "google.cloud.video.livestream.v1.Preproc"
120+
+ "essingConfig.Crop\022F\n\003pad\030\003 \001(\01329.google."
121+
+ "cloud.video.livestream.v1.PreprocessingC"
122+
+ "onfig.Pad\032\\\n\004Crop\022\022\n\ntop_pixels\030\001 \001(\005\022\025\n"
123+
+ "\rbottom_pixels\030\002 \001(\005\022\023\n\013left_pixels\030\003 \001("
124+
+ "\005\022\024\n\014right_pixels\030\004 \001(\005\032[\n\003Pad\022\022\n\ntop_pi"
125+
+ "xels\030\001 \001(\005\022\025\n\rbottom_pixels\030\002 \001(\005\022\023\n\013lef"
126+
+ "t_pixels\030\003 \001(\005\022\024\n\014right_pixels\030\004 \001(\005\"\377\003\n"
127+
+ "\013VideoStream\022O\n\004h264\030\024 \001(\0132?.google.clou"
128+
+ "d.video.livestream.v1.VideoStream.H264Co"
129+
+ "decSettingsH\000\032\214\003\n\021H264CodecSettings\022\024\n\014w"
130+
+ "idth_pixels\030\001 \001(\005\022\025\n\rheight_pixels\030\002 \001(\005"
131+
+ "\022\027\n\nframe_rate\030\003 \001(\001B\003\340A\002\022\030\n\013bitrate_bps"
132+
+ "\030\004 \001(\005B\003\340A\002\022\026\n\016allow_open_gop\030\006 \001(\010\022\031\n\017g"
133+
+ "op_frame_count\030\007 \001(\005H\000\0221\n\014gop_duration\030\010"
134+
+ " \001(\0132\031.google.protobuf.DurationH\000\022\025\n\rvbv"
135+
+ "_size_bits\030\t \001(\005\022\031\n\021vbv_fullness_bits\030\n "
136+
+ "\001(\005\022\025\n\rentropy_coder\030\013 \001(\t\022\021\n\tb_pyramid\030"
137+
+ "\014 \001(\010\022\025\n\rb_frame_count\030\r \001(\005\022\023\n\013aq_stren"
138+
+ "gth\030\016 \001(\001\022\017\n\007profile\030\017 \001(\t\022\014\n\004tune\030\020 \001(\t"
139+
+ "B\n\n\010gop_modeB\020\n\016codec_settings\"\332\002\n\013Audio"
140+
+ "Stream\022\020\n\010transmux\030\010 \001(\010\022\r\n\005codec\030\001 \001(\t\022"
141+
+ "\030\n\013bitrate_bps\030\002 \001(\005B\003\340A\002\022\025\n\rchannel_cou"
142+
+ "nt\030\003 \001(\005\022\026\n\016channel_layout\030\004 \003(\t\022K\n\007mapp"
143+
+ "ing\030\005 \003(\0132:.google.cloud.video.livestrea"
144+
+ "m.v1.AudioStream.AudioMapping\022\031\n\021sample_"
145+
+ "rate_hertz\030\006 \001(\005\032y\n\014AudioMapping\022\026\n\tinpu"
146+
+ "t_key\030\006 \001(\tB\003\340A\002\022\030\n\013input_track\030\002 \001(\005B\003\340"
147+
+ "A\002\022\032\n\rinput_channel\030\003 \001(\005B\003\340A\002\022\033\n\016output"
148+
+ "_channel\030\004 \001(\005B\003\340A\002\" \n\nTextStream\022\022\n\005cod"
149+
+ "ec\030\001 \001(\tB\003\340A\002\"F\n\017SegmentSettings\0223\n\020segm"
150+
+ "ent_duration\030\001 \001(\0132\031.google.protobuf.Dur"
151+
+ "ationB\357\001\n$com.google.cloud.video.livestr"
152+
+ "eam.v1B\014OutputsProtoP\001ZJgoogle.golang.or"
153+
+ "g/genproto/googleapis/cloud/video/livest"
154+
+ "ream/v1;livestream\252\002 Google.Cloud.Video."
155+
+ "LiveStream.V1\312\002 Google\\Cloud\\Video\\LiveS"
156+
+ "tream\\V1\352\002$Google::Cloud::Video::LiveStr"
157+
+ "eam::V1b\006proto3"
159158
};
160159
descriptor =
161160
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
162161
descriptorData,
163162
new com.google.protobuf.Descriptors.FileDescriptor[] {
164-
com.google.api.AnnotationsProto.getDescriptor(),
165163
com.google.api.FieldBehaviorProto.getDescriptor(),
166164
com.google.protobuf.DurationProto.getDescriptor(),
167165
});
@@ -310,7 +308,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
310308
registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
311309
com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
312310
descriptor, registry);
313-
com.google.api.AnnotationsProto.getDescriptor();
314311
com.google.api.FieldBehaviorProto.getDescriptor();
315312
com.google.protobuf.DurationProto.getDescriptor();
316313
}

0 commit comments

Comments
 (0)