diff --git a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Channel.java b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Channel.java index ad86bd2..2c46d52 100644 --- a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Channel.java +++ b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Channel.java @@ -355,8 +355,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum { * * *
-     * Channel is waiting for the input stream through the input. Live streams
-     * do not start yet.
+     * Channel is waiting for the input stream through the input.
      * 
* * AWAITING_INPUT = 2; @@ -380,6 +379,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum { *
      * Channel is generating live streams with no input stream. Live streams are
      * filled out with black screen, while input stream is missing.
+     * Not supported yet.
      * 
* * STREAMING_NO_INPUT = 5; @@ -443,8 +443,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum { * * *
-     * Channel is waiting for the input stream through the input. Live streams
-     * do not start yet.
+     * Channel is waiting for the input stream through the input.
      * 
* * AWAITING_INPUT = 2; @@ -468,6 +467,7 @@ public enum StreamingState implements com.google.protobuf.ProtocolMessageEnum { *
      * Channel is generating live streams with no input stream. Live streams are
      * filled out with black screen, while input stream is missing.
+     * Not supported yet.
      * 
* * STREAMING_NO_INPUT = 5; diff --git a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Event.java b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Event.java index e444453..cc69058 100644 --- a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Event.java +++ b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Event.java @@ -300,6 +300,16 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * PENDING = 5; */ PENDING(5), + /** + * + * + *
+     * Event was stopped before running for its full duration.
+     * 
+ * + * STOPPED = 6; + */ + STOPPED(6), UNRECOGNIZED(-1), ; @@ -363,6 +373,16 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * PENDING = 5; */ public static final int PENDING_VALUE = 5; + /** + * + * + *
+     * Event was stopped before running for its full duration.
+     * 
+ * + * STOPPED = 6; + */ + public static final int STOPPED_VALUE = 6; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -400,6 +420,8 @@ public static State forNumber(int value) { return FAILED; case 5: return PENDING; + case 6: + return STOPPED; default: return null; } diff --git a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Manifest.java b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Manifest.java index eefa699..2c4bfa3 100644 --- a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Manifest.java +++ b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/Manifest.java @@ -494,7 +494,7 @@ public com.google.protobuf.ByteString getMuxStreamsBytes(int index) { * Maximum number of segments that this manifest holds. Once the manifest * reaches this maximum number of segments, whenever a new segment is added to * the manifest, the oldest segment will be removed from the manifest. - * The minimum value is 1 and the default value is 5. + * The minimum value is 3 and the default value is 5. * * * int32 max_segment_count = 4; @@ -1414,7 +1414,7 @@ public Builder addMuxStreamsBytes(com.google.protobuf.ByteString value) { * Maximum number of segments that this manifest holds. Once the manifest * reaches this maximum number of segments, whenever a new segment is added to * the manifest, the oldest segment will be removed from the manifest. - * The minimum value is 1 and the default value is 5. + * The minimum value is 3 and the default value is 5. * * * int32 max_segment_count = 4; @@ -1432,7 +1432,7 @@ public int getMaxSegmentCount() { * Maximum number of segments that this manifest holds. Once the manifest * reaches this maximum number of segments, whenever a new segment is added to * the manifest, the oldest segment will be removed from the manifest. - * The minimum value is 1 and the default value is 5. + * The minimum value is 3 and the default value is 5. * * * int32 max_segment_count = 4; @@ -1453,7 +1453,7 @@ public Builder setMaxSegmentCount(int value) { * Maximum number of segments that this manifest holds. Once the manifest * reaches this maximum number of segments, whenever a new segment is added to * the manifest, the oldest segment will be removed from the manifest. - * The minimum value is 1 and the default value is 5. + * The minimum value is 3 and the default value is 5. * * * int32 max_segment_count = 4; diff --git a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ManifestOrBuilder.java b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ManifestOrBuilder.java index 83d234b..7514c59 100644 --- a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ManifestOrBuilder.java +++ b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ManifestOrBuilder.java @@ -155,7 +155,7 @@ public interface ManifestOrBuilder * Maximum number of segments that this manifest holds. Once the manifest * reaches this maximum number of segments, whenever a new segment is added to * the manifest, the oldest segment will be removed from the manifest. - * The minimum value is 1 and the default value is 5. + * The minimum value is 3 and the default value is 5. * * * int32 max_segment_count = 4; diff --git a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/OutputsProto.java b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/OutputsProto.java index bd169d3..c38030c 100644 --- a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/OutputsProto.java +++ b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/OutputsProto.java @@ -90,78 +90,76 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n.google/cloud/video/livestream/v1/outpu" + "ts.proto\022 google.cloud.video.livestream." - + "v1\032\034google/api/annotations.proto\032\037google" - + "/api/field_behavior.proto\032\036google/protob" - + "uf/duration.proto\"\207\002\n\020ElementaryStream\022\013" - + "\n\003key\030\004 \001(\t\022E\n\014video_stream\030\001 \001(\0132-.goog" - + "le.cloud.video.livestream.v1.VideoStream" - + "H\000\022E\n\014audio_stream\030\002 \001(\0132-.google.cloud." - + "video.livestream.v1.AudioStreamH\000\022C\n\013tex" - + "t_stream\030\003 \001(\0132,.google.cloud.video.live" - + "stream.v1.TextStreamH\000B\023\n\021elementary_str" - + "eam\"\224\001\n\tMuxStream\022\013\n\003key\030\001 \001(\t\022\021\n\tcontai" - + "ner\030\003 \001(\t\022\032\n\022elementary_streams\030\004 \003(\t\022K\n" - + "\020segment_settings\030\005 \001(\01321.google.cloud.v" - + "ideo.livestream.v1.SegmentSettings\"\232\002\n\010M" - + "anifest\022\021\n\tfile_name\030\001 \001(\t\022J\n\004type\030\002 \001(\016" - + "27.google.cloud.video.livestream.v1.Mani" - + "fest.ManifestTypeB\003\340A\002\022\030\n\013mux_streams\030\003 " - + "\003(\tB\003\340A\002\022\031\n\021max_segment_count\030\004 \001(\005\0228\n\025s" - + "egment_keep_duration\030\005 \001(\0132\031.google.prot" - + "obuf.Duration\"@\n\014ManifestType\022\035\n\031MANIFES" - + "T_TYPE_UNSPECIFIED\020\000\022\007\n\003HLS\020\001\022\010\n\004DASH\020\002\"" - + "\343\001\n\013SpriteSheet\022\016\n\006format\030\001 \001(\t\022\030\n\013file_" - + "prefix\030\002 \001(\tB\003\340A\002\022 \n\023sprite_width_pixels" - + "\030\003 \001(\005B\003\340A\002\022!\n\024sprite_height_pixels\030\004 \001(" - + "\005B\003\340A\002\022\024\n\014column_count\030\005 \001(\005\022\021\n\trow_coun" - + "t\030\006 \001(\005\022+\n\010interval\030\007 \001(\0132\031.google.proto" - + "buf.Duration\022\017\n\007quality\030\010 \001(\005\"\342\002\n\023Prepro" - + "cessingConfig\022H\n\004crop\030\002 \001(\0132:.google.clo" - + "ud.video.livestream.v1.PreprocessingConf" - + "ig.Crop\022F\n\003pad\030\003 \001(\01329.google.cloud.vide" - + "o.livestream.v1.PreprocessingConfig.Pad\032" - + "\\\n\004Crop\022\022\n\ntop_pixels\030\001 \001(\005\022\025\n\rbottom_pi" - + "xels\030\002 \001(\005\022\023\n\013left_pixels\030\003 \001(\005\022\024\n\014right" - + "_pixels\030\004 \001(\005\032[\n\003Pad\022\022\n\ntop_pixels\030\001 \001(\005" - + "\022\025\n\rbottom_pixels\030\002 \001(\005\022\023\n\013left_pixels\030\003" - + " \001(\005\022\024\n\014right_pixels\030\004 \001(\005\"\377\003\n\013VideoStre" - + "am\022O\n\004h264\030\024 \001(\0132?.google.cloud.video.li" - + "vestream.v1.VideoStream.H264CodecSetting" - + "sH\000\032\214\003\n\021H264CodecSettings\022\024\n\014width_pixel" - + "s\030\001 \001(\005\022\025\n\rheight_pixels\030\002 \001(\005\022\027\n\nframe_" - + "rate\030\003 \001(\001B\003\340A\002\022\030\n\013bitrate_bps\030\004 \001(\005B\003\340A" - + "\002\022\026\n\016allow_open_gop\030\006 \001(\010\022\031\n\017gop_frame_c" - + "ount\030\007 \001(\005H\000\0221\n\014gop_duration\030\010 \001(\0132\031.goo" - + "gle.protobuf.DurationH\000\022\025\n\rvbv_size_bits" - + "\030\t \001(\005\022\031\n\021vbv_fullness_bits\030\n \001(\005\022\025\n\rent" - + "ropy_coder\030\013 \001(\t\022\021\n\tb_pyramid\030\014 \001(\010\022\025\n\rb" - + "_frame_count\030\r \001(\005\022\023\n\013aq_strength\030\016 \001(\001\022" - + "\017\n\007profile\030\017 \001(\t\022\014\n\004tune\030\020 \001(\tB\n\n\010gop_mo" - + "deB\020\n\016codec_settings\"\332\002\n\013AudioStream\022\020\n\010" - + "transmux\030\010 \001(\010\022\r\n\005codec\030\001 \001(\t\022\030\n\013bitrate" - + "_bps\030\002 \001(\005B\003\340A\002\022\025\n\rchannel_count\030\003 \001(\005\022\026" - + "\n\016channel_layout\030\004 \003(\t\022K\n\007mapping\030\005 \003(\0132" - + ":.google.cloud.video.livestream.v1.Audio" - + "Stream.AudioMapping\022\031\n\021sample_rate_hertz" - + "\030\006 \001(\005\032y\n\014AudioMapping\022\026\n\tinput_key\030\006 \001(" - + "\tB\003\340A\002\022\030\n\013input_track\030\002 \001(\005B\003\340A\002\022\032\n\rinpu" - + "t_channel\030\003 \001(\005B\003\340A\002\022\033\n\016output_channel\030\004" - + " \001(\005B\003\340A\002\" \n\nTextStream\022\022\n\005codec\030\001 \001(\tB\003" - + "\340A\002\"F\n\017SegmentSettings\0223\n\020segment_durati" - + "on\030\001 \001(\0132\031.google.protobuf.DurationB\357\001\n$" - + "com.google.cloud.video.livestream.v1B\014Ou" - + "tputsProtoP\001ZJgoogle.golang.org/genproto" - + "/googleapis/cloud/video/livestream/v1;li" - + "vestream\252\002 Google.Cloud.Video.LiveStream" - + ".V1\312\002 Google\\Cloud\\Video\\LiveStream\\V1\352\002" - + "$Google::Cloud::Video::LiveStream::V1b\006p" - + "roto3" + + "v1\032\037google/api/field_behavior.proto\032\036goo" + + "gle/protobuf/duration.proto\"\207\002\n\020Elementa" + + "ryStream\022\013\n\003key\030\004 \001(\t\022E\n\014video_stream\030\001 " + + "\001(\0132-.google.cloud.video.livestream.v1.V" + + "ideoStreamH\000\022E\n\014audio_stream\030\002 \001(\0132-.goo" + + "gle.cloud.video.livestream.v1.AudioStrea" + + "mH\000\022C\n\013text_stream\030\003 \001(\0132,.google.cloud." + + "video.livestream.v1.TextStreamH\000B\023\n\021elem" + + "entary_stream\"\224\001\n\tMuxStream\022\013\n\003key\030\001 \001(\t" + + "\022\021\n\tcontainer\030\003 \001(\t\022\032\n\022elementary_stream" + + "s\030\004 \003(\t\022K\n\020segment_settings\030\005 \001(\01321.goog" + + "le.cloud.video.livestream.v1.SegmentSett" + + "ings\"\232\002\n\010Manifest\022\021\n\tfile_name\030\001 \001(\t\022J\n\004" + + "type\030\002 \001(\01627.google.cloud.video.livestre" + + "am.v1.Manifest.ManifestTypeB\003\340A\002\022\030\n\013mux_" + + "streams\030\003 \003(\tB\003\340A\002\022\031\n\021max_segment_count\030" + + "\004 \001(\005\0228\n\025segment_keep_duration\030\005 \001(\0132\031.g" + + "oogle.protobuf.Duration\"@\n\014ManifestType\022" + + "\035\n\031MANIFEST_TYPE_UNSPECIFIED\020\000\022\007\n\003HLS\020\001\022" + + "\010\n\004DASH\020\002\"\343\001\n\013SpriteSheet\022\016\n\006format\030\001 \001(" + + "\t\022\030\n\013file_prefix\030\002 \001(\tB\003\340A\002\022 \n\023sprite_wi" + + "dth_pixels\030\003 \001(\005B\003\340A\002\022!\n\024sprite_height_p" + + "ixels\030\004 \001(\005B\003\340A\002\022\024\n\014column_count\030\005 \001(\005\022\021" + + "\n\trow_count\030\006 \001(\005\022+\n\010interval\030\007 \001(\0132\031.go" + + "ogle.protobuf.Duration\022\017\n\007quality\030\010 \001(\005\"" + + "\342\002\n\023PreprocessingConfig\022H\n\004crop\030\002 \001(\0132:." + + "google.cloud.video.livestream.v1.Preproc" + + "essingConfig.Crop\022F\n\003pad\030\003 \001(\01329.google." + + "cloud.video.livestream.v1.PreprocessingC" + + "onfig.Pad\032\\\n\004Crop\022\022\n\ntop_pixels\030\001 \001(\005\022\025\n" + + "\rbottom_pixels\030\002 \001(\005\022\023\n\013left_pixels\030\003 \001(" + + "\005\022\024\n\014right_pixels\030\004 \001(\005\032[\n\003Pad\022\022\n\ntop_pi" + + "xels\030\001 \001(\005\022\025\n\rbottom_pixels\030\002 \001(\005\022\023\n\013lef" + + "t_pixels\030\003 \001(\005\022\024\n\014right_pixels\030\004 \001(\005\"\377\003\n" + + "\013VideoStream\022O\n\004h264\030\024 \001(\0132?.google.clou" + + "d.video.livestream.v1.VideoStream.H264Co" + + "decSettingsH\000\032\214\003\n\021H264CodecSettings\022\024\n\014w" + + "idth_pixels\030\001 \001(\005\022\025\n\rheight_pixels\030\002 \001(\005" + + "\022\027\n\nframe_rate\030\003 \001(\001B\003\340A\002\022\030\n\013bitrate_bps" + + "\030\004 \001(\005B\003\340A\002\022\026\n\016allow_open_gop\030\006 \001(\010\022\031\n\017g" + + "op_frame_count\030\007 \001(\005H\000\0221\n\014gop_duration\030\010" + + " \001(\0132\031.google.protobuf.DurationH\000\022\025\n\rvbv" + + "_size_bits\030\t \001(\005\022\031\n\021vbv_fullness_bits\030\n " + + "\001(\005\022\025\n\rentropy_coder\030\013 \001(\t\022\021\n\tb_pyramid\030" + + "\014 \001(\010\022\025\n\rb_frame_count\030\r \001(\005\022\023\n\013aq_stren" + + "gth\030\016 \001(\001\022\017\n\007profile\030\017 \001(\t\022\014\n\004tune\030\020 \001(\t" + + "B\n\n\010gop_modeB\020\n\016codec_settings\"\332\002\n\013Audio" + + "Stream\022\020\n\010transmux\030\010 \001(\010\022\r\n\005codec\030\001 \001(\t\022" + + "\030\n\013bitrate_bps\030\002 \001(\005B\003\340A\002\022\025\n\rchannel_cou" + + "nt\030\003 \001(\005\022\026\n\016channel_layout\030\004 \003(\t\022K\n\007mapp" + + "ing\030\005 \003(\0132:.google.cloud.video.livestrea" + + "m.v1.AudioStream.AudioMapping\022\031\n\021sample_" + + "rate_hertz\030\006 \001(\005\032y\n\014AudioMapping\022\026\n\tinpu" + + "t_key\030\006 \001(\tB\003\340A\002\022\030\n\013input_track\030\002 \001(\005B\003\340" + + "A\002\022\032\n\rinput_channel\030\003 \001(\005B\003\340A\002\022\033\n\016output" + + "_channel\030\004 \001(\005B\003\340A\002\" \n\nTextStream\022\022\n\005cod" + + "ec\030\001 \001(\tB\003\340A\002\"F\n\017SegmentSettings\0223\n\020segm" + + "ent_duration\030\001 \001(\0132\031.google.protobuf.Dur" + + "ationB\357\001\n$com.google.cloud.video.livestr" + + "eam.v1B\014OutputsProtoP\001ZJgoogle.golang.or" + + "g/genproto/googleapis/cloud/video/livest" + + "ream/v1;livestream\252\002 Google.Cloud.Video." + + "LiveStream.V1\312\002 Google\\Cloud\\Video\\LiveS" + + "tream\\V1\352\002$Google::Cloud::Video::LiveStr" + + "eam::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), com.google.protobuf.DurationProto.getDescriptor(), }); @@ -310,7 +308,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.FieldBehaviorProto.fieldBehavior); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.api.AnnotationsProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); com.google.protobuf.DurationProto.getDescriptor(); } diff --git a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ResourcesProto.java b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ResourcesProto.java index 54cc4d0..bf87f97 100644 --- a/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ResourcesProto.java +++ b/proto-google-cloud-live-stream-v1/src/main/java/com/google/cloud/video/livestream/v1/ResourcesProto.java @@ -106,123 +106,121 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n0google/cloud/video/livestream/v1/resou" + "rces.proto\022 google.cloud.video.livestrea" - + "m.v1\032\034google/api/annotations.proto\032\037goog" - + "le/api/field_behavior.proto\032\031google/api/" - + "resource.proto\032.google/cloud/video/lives" - + "tream/v1/outputs.proto\032\036google/protobuf/" - + "duration.proto\032\037google/protobuf/timestam" - + "p.proto\032\027google/rpc/status.proto\"\360\006\n\005Inp" - + "ut\022\014\n\004name\030\001 \001(\t\0224\n\013create_time\030\002 \001(\0132\032." - + "google.protobuf.TimestampB\003\340A\003\0224\n\013update" - + "_time\030\003 \001(\0132\032.google.protobuf.TimestampB" - + "\003\340A\003\022C\n\006labels\030\004 \003(\01323.google.cloud.vide" - + "o.livestream.v1.Input.LabelsEntry\022:\n\004typ" - + "e\030\005 \001(\0162,.google.cloud.video.livestream." - + "v1.Input.Type\022:\n\004tier\030\016 \001(\0162,.google.clo" - + "ud.video.livestream.v1.Input.Tier\022\020\n\003uri" - + "\030\006 \001(\tB\003\340A\003\022S\n\024preprocessing_config\030\t \001(" - + "\01325.google.cloud.video.livestream.v1.Pre" - + "processingConfig\022L\n\016security_rules\030\014 \001(\013" - + "24.google.cloud.video.livestream.v1.Inpu" - + "t.SecurityRule\022Y\n\025input_stream_property\030" - + "\017 \001(\01325.google.cloud.video.livestream.v1" - + ".InputStreamPropertyB\003\340A\003\032!\n\014SecurityRul" - + "e\022\021\n\tip_ranges\030\001 \003(\t\032-\n\013LabelsEntry\022\013\n\003k" - + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"9\n\004Type\022\024\n\020T" - + "YPE_UNSPECIFIED\020\000\022\r\n\tRTMP_PUSH\020\001\022\014\n\010SRT_" - + "PUSH\020\002\"5\n\004Tier\022\024\n\020TIER_UNSPECIFIED\020\000\022\006\n\002" - + "SD\020\001\022\006\n\002HD\020\002\022\007\n\003UHD\020\003:\\\352AY\n\037livestream.g" - + "oogleapis.com/Input\0226projects/{project}/" - + "locations/{location}/inputs/{input}\"\263\t\n\007" - + "Channel\022\014\n\004name\030\001 \001(\t\0224\n\013create_time\030\002 \001" - + "(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n\013u" - + "pdate_time\030\003 \001(\0132\032.google.protobuf.Times" - + "tampB\003\340A\003\022E\n\006labels\030\004 \003(\01325.google.cloud" - + ".video.livestream.v1.Channel.LabelsEntry" - + "\022L\n\021input_attachments\030\020 \003(\01321.google.clo" - + "ud.video.livestream.v1.InputAttachment\022\031" - + "\n\014active_input\030\006 \001(\tB\003\340A\003\022E\n\006output\030\t \001(" - + "\01320.google.cloud.video.livestream.v1.Cha" - + "nnel.OutputB\003\340A\002\022N\n\022elementary_streams\030\n" - + " \003(\01322.google.cloud.video.livestream.v1." - + "ElementaryStream\022@\n\013mux_streams\030\013 \003(\0132+." - + "google.cloud.video.livestream.v1.MuxStre" - + "am\022=\n\tmanifests\030\014 \003(\0132*.google.cloud.vid" - + "eo.livestream.v1.Manifest\022D\n\rsprite_shee" - + "ts\030\r \003(\0132-.google.cloud.video.livestream" - + ".v1.SpriteSheet\022V\n\017streaming_state\030\016 \001(\016" - + "28.google.cloud.video.livestream.v1.Chan" - + "nel.StreamingStateB\003\340A\003\0220\n\017streaming_err" - + "or\030\022 \001(\0132\022.google.rpc.StatusB\003\340A\003\022?\n\nlog" - + "_config\030\023 \001(\0132+.google.cloud.video.lives" - + "tream.v1.LogConfig\032\025\n\006Output\022\013\n\003uri\030\001 \001(" - + "\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" - + " \001(\t:\0028\001\"\252\001\n\016StreamingState\022\037\n\033STREAMING" - + "_STATE_UNSPECIFIED\020\000\022\r\n\tSTREAMING\020\001\022\022\n\016A" - + "WAITING_INPUT\020\002\022\023\n\017STREAMING_ERROR\020\004\022\026\n\022" - + "STREAMING_NO_INPUT\020\005\022\013\n\007STOPPED\020\006\022\014\n\010STA" - + "RTING\020\007\022\014\n\010STOPPING\020\010:b\352A_\n!livestream.g" - + "oogleapis.com/Channel\022:projects/{project" - + "}/locations/{location}/channels/{channel" - + "}\"\300\001\n\tLogConfig\022M\n\014log_severity\030\001 \001(\01627." - + "google.cloud.video.livestream.v1.LogConf" - + "ig.LogSeverity\"d\n\013LogSeverity\022\034\n\030LOG_SEV" - + "ERITY_UNSPECIFIED\020\000\022\007\n\003OFF\020\001\022\t\n\005DEBUG\020d\022" - + "\t\n\004INFO\020\310\001\022\014\n\007WARNING\020\220\003\022\n\n\005ERROR\020\364\003\"\352\001\n" - + "\023InputStreamProperty\0227\n\023last_establish_t" - + "ime\030\001 \001(\0132\032.google.protobuf.Timestamp\022L\n" - + "\rvideo_streams\030\002 \003(\01325.google.cloud.vide" - + "o.livestream.v1.VideoStreamProperty\022L\n\ra" - + "udio_streams\030\003 \003(\01325.google.cloud.video." - + "livestream.v1.AudioStreamProperty\"i\n\023Vid" - + "eoStreamProperty\022\r\n\005index\030\001 \001(\005\022C\n\014video" - + "_format\030\002 \001(\0132-.google.cloud.video.lives" - + "tream.v1.VideoFormat\"]\n\013VideoFormat\022\r\n\005c" - + "odec\030\001 \001(\t\022\024\n\014width_pixels\030\002 \001(\005\022\025\n\rheig" - + "ht_pixels\030\003 \001(\005\022\022\n\nframe_rate\030\004 \001(\001\"i\n\023A" - + "udioStreamProperty\022\r\n\005index\030\001 \001(\005\022C\n\014aud" - + "io_format\030\002 \001(\0132-.google.cloud.video.liv" - + "estream.v1.AudioFormat\"K\n\013AudioFormat\022\r\n" - + "\005codec\030\001 \001(\t\022\025\n\rchannel_count\030\002 \001(\005\022\026\n\016c" - + "hannel_layout\030\003 \003(\t\"\335\001\n\017InputAttachment\022" - + "\013\n\003key\030\001 \001(\t\0223\n\005input\030\002 \001(\tB$\372A!\n\037livest" - + "ream.googleapis.com/Input\022_\n\022automatic_f" - + "ailover\030\003 \001(\0132C.google.cloud.video.lives" - + "tream.v1.InputAttachment.AutomaticFailov" - + "er\032\'\n\021AutomaticFailover\022\022\n\ninput_keys\030\001 " - + "\003(\t\"\220\006\n\005Event\022\014\n\004name\030\001 \001(\t\0224\n\013create_ti" - + "me\030\002 \001(\0132\032.google.protobuf.TimestampB\003\340A" - + "\003\0224\n\013update_time\030\003 \001(\0132\032.google.protobuf" - + ".TimestampB\003\340A\003\022C\n\006labels\030\004 \003(\01323.google" - + ".cloud.video.livestream.v1.Event.LabelsE" - + "ntry\022L\n\010ad_break\030\006 \001(\01323.google.cloud.vi" - + "deo.livestream.v1.Event.AdBreakTaskB\003\340A\002" - + "H\000\022\023\n\013execute_now\030\t \001(\010\0222\n\016execution_tim" - + "e\030\n \001(\0132\032.google.protobuf.Timestamp\022A\n\005s" - + "tate\030\013 \001(\0162-.google.cloud.video.livestre" - + "am.v1.Event.StateB\003\340A\003\022&\n\005error\030\014 \001(\0132\022." - + "google.rpc.StatusB\003\340A\003\032:\n\013AdBreakTask\022+\n" - + "\010duration\030\001 \001(\0132\031.google.protobuf.Durati" - + "on\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" - + "\002 \001(\t:\0028\001\"b\n\005State\022\025\n\021STATE_UNSPECIFIED\020" - + "\000\022\r\n\tSCHEDULED\020\001\022\013\n\007RUNNING\020\002\022\r\n\tSUCCEED" - + "ED\020\003\022\n\n\006FAILED\020\004\022\013\n\007PENDING\020\005:o\352Al\n\037live" - + "stream.googleapis.com/Event\022Iprojects/{p" - + "roject}/locations/{location}/channels/{c" - + "hannel}/events/{event}B\006\n\004taskB\361\001\n$com.g" - + "oogle.cloud.video.livestream.v1B\016Resourc" - + "esProtoP\001ZJgoogle.golang.org/genproto/go" - + "ogleapis/cloud/video/livestream/v1;lives" - + "tream\252\002 Google.Cloud.Video.LiveStream.V1" - + "\312\002 Google\\Cloud\\Video\\LiveStream\\V1\352\002$Go" - + "ogle::Cloud::Video::LiveStream::V1b\006prot" - + "o3" + + "m.v1\032\037google/api/field_behavior.proto\032\031g" + + "oogle/api/resource.proto\032.google/cloud/v" + + "ideo/livestream/v1/outputs.proto\032\036google" + + "/protobuf/duration.proto\032\037google/protobu" + + "f/timestamp.proto\032\027google/rpc/status.pro" + + "to\"\360\006\n\005Input\022\014\n\004name\030\001 \001(\t\0224\n\013create_tim" + + "e\030\002 \001(\0132\032.google.protobuf.TimestampB\003\340A\003" + + "\0224\n\013update_time\030\003 \001(\0132\032.google.protobuf." + + "TimestampB\003\340A\003\022C\n\006labels\030\004 \003(\01323.google." + + "cloud.video.livestream.v1.Input.LabelsEn" + + "try\022:\n\004type\030\005 \001(\0162,.google.cloud.video.l" + + "ivestream.v1.Input.Type\022:\n\004tier\030\016 \001(\0162,." + + "google.cloud.video.livestream.v1.Input.T" + + "ier\022\020\n\003uri\030\006 \001(\tB\003\340A\003\022S\n\024preprocessing_c" + + "onfig\030\t \001(\01325.google.cloud.video.livestr" + + "eam.v1.PreprocessingConfig\022L\n\016security_r" + + "ules\030\014 \001(\01324.google.cloud.video.livestre" + + "am.v1.Input.SecurityRule\022Y\n\025input_stream" + + "_property\030\017 \001(\01325.google.cloud.video.liv" + + "estream.v1.InputStreamPropertyB\003\340A\003\032!\n\014S" + + "ecurityRule\022\021\n\tip_ranges\030\001 \003(\t\032-\n\013Labels" + + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"9\n" + + "\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\r\n\tRTMP_PUSH" + + "\020\001\022\014\n\010SRT_PUSH\020\002\"5\n\004Tier\022\024\n\020TIER_UNSPECI" + + "FIED\020\000\022\006\n\002SD\020\001\022\006\n\002HD\020\002\022\007\n\003UHD\020\003:\\\352AY\n\037li" + + "vestream.googleapis.com/Input\0226projects/" + + "{project}/locations/{location}/inputs/{i" + + "nput}\"\263\t\n\007Channel\022\014\n\004name\030\001 \001(\t\0224\n\013creat" + + "e_time\030\002 \001(\0132\032.google.protobuf.Timestamp" + + "B\003\340A\003\0224\n\013update_time\030\003 \001(\0132\032.google.prot" + + "obuf.TimestampB\003\340A\003\022E\n\006labels\030\004 \003(\01325.go" + + "ogle.cloud.video.livestream.v1.Channel.L" + + "abelsEntry\022L\n\021input_attachments\030\020 \003(\01321." + + "google.cloud.video.livestream.v1.InputAt" + + "tachment\022\031\n\014active_input\030\006 \001(\tB\003\340A\003\022E\n\006o" + + "utput\030\t \001(\01320.google.cloud.video.livestr" + + "eam.v1.Channel.OutputB\003\340A\002\022N\n\022elementary" + + "_streams\030\n \003(\01322.google.cloud.video.live" + + "stream.v1.ElementaryStream\022@\n\013mux_stream" + + "s\030\013 \003(\0132+.google.cloud.video.livestream." + + "v1.MuxStream\022=\n\tmanifests\030\014 \003(\0132*.google" + + ".cloud.video.livestream.v1.Manifest\022D\n\rs" + + "prite_sheets\030\r \003(\0132-.google.cloud.video." + + "livestream.v1.SpriteSheet\022V\n\017streaming_s" + + "tate\030\016 \001(\01628.google.cloud.video.livestre" + + "am.v1.Channel.StreamingStateB\003\340A\003\0220\n\017str" + + "eaming_error\030\022 \001(\0132\022.google.rpc.StatusB\003" + + "\340A\003\022?\n\nlog_config\030\023 \001(\0132+.google.cloud.v" + + "ideo.livestream.v1.LogConfig\032\025\n\006Output\022\013" + + "\n\003uri\030\001 \001(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022" + + "\r\n\005value\030\002 \001(\t:\0028\001\"\252\001\n\016StreamingState\022\037\n" + + "\033STREAMING_STATE_UNSPECIFIED\020\000\022\r\n\tSTREAM" + + "ING\020\001\022\022\n\016AWAITING_INPUT\020\002\022\023\n\017STREAMING_E" + + "RROR\020\004\022\026\n\022STREAMING_NO_INPUT\020\005\022\013\n\007STOPPE" + + "D\020\006\022\014\n\010STARTING\020\007\022\014\n\010STOPPING\020\010:b\352A_\n!li" + + "vestream.googleapis.com/Channel\022:project" + + "s/{project}/locations/{location}/channel" + + "s/{channel}\"\300\001\n\tLogConfig\022M\n\014log_severit" + + "y\030\001 \001(\01627.google.cloud.video.livestream." + + "v1.LogConfig.LogSeverity\"d\n\013LogSeverity\022" + + "\034\n\030LOG_SEVERITY_UNSPECIFIED\020\000\022\007\n\003OFF\020\001\022\t" + + "\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\014\n\007WARNING\020\220\003\022\n\n\005ER" + + "ROR\020\364\003\"\352\001\n\023InputStreamProperty\0227\n\023last_e" + + "stablish_time\030\001 \001(\0132\032.google.protobuf.Ti" + + "mestamp\022L\n\rvideo_streams\030\002 \003(\01325.google." + + "cloud.video.livestream.v1.VideoStreamPro" + + "perty\022L\n\raudio_streams\030\003 \003(\01325.google.cl" + + "oud.video.livestream.v1.AudioStreamPrope" + + "rty\"i\n\023VideoStreamProperty\022\r\n\005index\030\001 \001(" + + "\005\022C\n\014video_format\030\002 \001(\0132-.google.cloud.v" + + "ideo.livestream.v1.VideoFormat\"]\n\013VideoF" + + "ormat\022\r\n\005codec\030\001 \001(\t\022\024\n\014width_pixels\030\002 \001" + + "(\005\022\025\n\rheight_pixels\030\003 \001(\005\022\022\n\nframe_rate\030" + + "\004 \001(\001\"i\n\023AudioStreamProperty\022\r\n\005index\030\001 " + + "\001(\005\022C\n\014audio_format\030\002 \001(\0132-.google.cloud" + + ".video.livestream.v1.AudioFormat\"K\n\013Audi" + + "oFormat\022\r\n\005codec\030\001 \001(\t\022\025\n\rchannel_count\030" + + "\002 \001(\005\022\026\n\016channel_layout\030\003 \003(\t\"\335\001\n\017InputA" + + "ttachment\022\013\n\003key\030\001 \001(\t\0223\n\005input\030\002 \001(\tB$\372" + + "A!\n\037livestream.googleapis.com/Input\022_\n\022a" + + "utomatic_failover\030\003 \001(\0132C.google.cloud.v" + + "ideo.livestream.v1.InputAttachment.Autom" + + "aticFailover\032\'\n\021AutomaticFailover\022\022\n\ninp" + + "ut_keys\030\001 \003(\t\"\235\006\n\005Event\022\014\n\004name\030\001 \001(\t\0224\n" + + "\013create_time\030\002 \001(\0132\032.google.protobuf.Tim" + + "estampB\003\340A\003\0224\n\013update_time\030\003 \001(\0132\032.googl" + + "e.protobuf.TimestampB\003\340A\003\022C\n\006labels\030\004 \003(" + + "\01323.google.cloud.video.livestream.v1.Eve" + + "nt.LabelsEntry\022L\n\010ad_break\030\006 \001(\01323.googl" + + "e.cloud.video.livestream.v1.Event.AdBrea" + + "kTaskB\003\340A\002H\000\022\023\n\013execute_now\030\t \001(\010\0222\n\016exe" + + "cution_time\030\n \001(\0132\032.google.protobuf.Time" + + "stamp\022A\n\005state\030\013 \001(\0162-.google.cloud.vide" + + "o.livestream.v1.Event.StateB\003\340A\003\022&\n\005erro" + + "r\030\014 \001(\0132\022.google.rpc.StatusB\003\340A\003\032:\n\013AdBr" + + "eakTask\022+\n\010duration\030\001 \001(\0132\031.google.proto" + + "buf.Duration\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t" + + "\022\r\n\005value\030\002 \001(\t:\0028\001\"o\n\005State\022\025\n\021STATE_UN" + + "SPECIFIED\020\000\022\r\n\tSCHEDULED\020\001\022\013\n\007RUNNING\020\002\022" + + "\r\n\tSUCCEEDED\020\003\022\n\n\006FAILED\020\004\022\013\n\007PENDING\020\005\022" + + "\013\n\007STOPPED\020\006:o\352Al\n\037livestream.googleapis" + + ".com/Event\022Iprojects/{project}/locations" + + "/{location}/channels/{channel}/events/{e" + + "vent}B\006\n\004taskB\361\001\n$com.google.cloud.video" + + ".livestream.v1B\016ResourcesProtoP\001ZJgoogle" + + ".golang.org/genproto/googleapis/cloud/vi" + + "deo/livestream/v1;livestream\252\002 Google.Cl" + + "oud.Video.LiveStream.V1\312\002 Google\\Cloud\\V" + + "ideo\\LiveStream\\V1\352\002$Google::Cloud::Vide" + + "o::LiveStream::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), com.google.api.ResourceProto.getDescriptor(), com.google.cloud.video.livestream.v1.OutputsProto.getDescriptor(), @@ -406,7 +404,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ResourceProto.resourceReference); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.api.AnnotationsProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); com.google.api.ResourceProto.getDescriptor(); com.google.cloud.video.livestream.v1.OutputsProto.getDescriptor(); diff --git a/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/outputs.proto b/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/outputs.proto index d54fa65..90ab85b 100644 --- a/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/outputs.proto +++ b/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/outputs.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ syntax = "proto3"; package google.cloud.video.livestream.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/protobuf/duration.proto"; @@ -106,7 +105,7 @@ message Manifest { // Maximum number of segments that this manifest holds. Once the manifest // reaches this maximum number of segments, whenever a new segment is added to // the manifest, the oldest segment will be removed from the manifest. - // The minimum value is 1 and the default value is 5. + // The minimum value is 3 and the default value is 5. int32 max_segment_count = 4; // How long to keep a segment on the output Google Cloud Storage bucket after diff --git a/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/resources.proto b/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/resources.proto index 4040746..b9159ec 100644 --- a/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/resources.proto +++ b/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/resources.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ syntax = "proto3"; package google.cloud.video.livestream.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; import "google/cloud/video/livestream/v1/outputs.proto"; @@ -143,8 +142,7 @@ message Channel { // specified output location. STREAMING = 1; - // Channel is waiting for the input stream through the input. Live streams - // do not start yet. + // Channel is waiting for the input stream through the input. AWAITING_INPUT = 2; // Channel is running, but has trouble publishing the live streams onto the @@ -154,6 +152,7 @@ message Channel { // Channel is generating live streams with no input stream. Live streams are // filled out with black screen, while input stream is missing. + // Not supported yet. STREAMING_NO_INPUT = 5; // Channel is stopped, finishing live streams. @@ -366,6 +365,9 @@ message Event { // Event has been created but not scheduled yet. PENDING = 5; + + // Event was stopped before running for its full duration. + STOPPED = 6; } // The resource name of the event, in the form of: diff --git a/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/service.proto b/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/service.proto index c2c6f87..8ef65d8 100644 --- a/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/service.proto +++ b/proto-google-cloud-live-stream-v1/src/main/proto/google/cloud/video/livestream/v1/service.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.