From 98686dd64eb2c6d89b22ba7d1bf7f820049788f0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Jun 2022 20:36:14 +0000 Subject: [PATCH] chore: Integrate new gapic-generator-java and rules_gapic (#41) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 454027580 Source-Link: https://github.com/googleapis/googleapis/commit/1b222777baa702e7135610355706570ed2b56318 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 feat: add asset_id and stream_id fields to VodSession and LiveSession responses fix!: remove COMPLETE_POD stitching option PiperOrigin-RevId: 454023909 Source-Link: https://github.com/googleapis/googleapis/commit/f296ef560e18240baf983bcfb8a08e5b81714647 Source-Link: https://github.com/googleapis/googleapis-gen/commit/bb5e9fcb21404eb0f6e649443c41c5acfdc301e1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYmI1ZTlmY2IyMTQwNGViMGY2ZTY0OTQ0M2M0MWM1YWNmZGMzMDFlMSJ9 --- .../v1/VideoStitcherServiceClient.java | 28 +- .../v1/VideoStitcherServiceClientTest.java | 8 + .../clirr-ignored-differences.xml | 10 + .../stitcher/v1/CreateLiveSessionRequest.java | 49 --- .../v1/CreateLiveSessionRequestOrBuilder.java | 14 - .../cloud/video/stitcher/v1/LiveSession.java | 201 ++++++++-- .../stitcher/v1/LiveSessionOrBuilder.java | 25 ++ .../video/stitcher/v1/SessionsProto.java | 116 +++--- .../v1/VideoStitcherServiceProto.java | 374 +++++++++--------- .../cloud/video/stitcher/v1/VodSession.java | 179 +++++++++ .../stitcher/v1/VodSessionOrBuilder.java | 25 ++ .../cloud/video/stitcher/v1/sessions.proto | 9 +- .../stitcher/v1/video_stitcher_service.proto | 11 - 13 files changed, 680 insertions(+), 369 deletions(-) diff --git a/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java b/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java index e58691a13ffb..8971de5ff1c9 100644 --- a/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java +++ b/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java @@ -435,7 +435,7 @@ public final ListCdnKeysPagedResponse listCdnKeys(ListCdnKeysRequest request) { * while (true) { * ListCdnKeysResponse response = * videoStitcherServiceClient.listCdnKeysCallable().call(request); - * for (CdnKey element : response.getResponsesList()) { + * for (CdnKey element : response.getCdnKeysList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -1107,7 +1107,7 @@ public final ListVodStitchDetailsPagedResponse listVodStitchDetails( * while (true) { * ListVodStitchDetailsResponse response = * videoStitcherServiceClient.listVodStitchDetailsCallable().call(request); - * for (VodStitchDetail element : response.getResponsesList()) { + * for (VodStitchDetail element : response.getVodStitchDetailsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -1386,7 +1386,7 @@ public final ListVodAdTagDetailsPagedResponse listVodAdTagDetails( * while (true) { * ListVodAdTagDetailsResponse response = * videoStitcherServiceClient.listVodAdTagDetailsCallable().call(request); - * for (VodAdTagDetail element : response.getResponsesList()) { + * for (VodAdTagDetail element : response.getVodAdTagDetailsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -1663,7 +1663,7 @@ public final ListLiveAdTagDetailsPagedResponse listLiveAdTagDetails( * while (true) { * ListLiveAdTagDetailsResponse response = * videoStitcherServiceClient.listLiveAdTagDetailsCallable().call(request); - * for (LiveAdTagDetail element : response.getResponsesList()) { + * for (LiveAdTagDetail element : response.getLiveAdTagDetailsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -2065,7 +2065,7 @@ public final UnaryCallable listSlate * .build(); * while (true) { * ListSlatesResponse response = videoStitcherServiceClient.listSlatesCallable().call(request); - * for (Slate element : response.getResponsesList()) { + * for (Slate element : response.getSlatesList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -2387,15 +2387,6 @@ public final UnaryCallable deleteSlateCallable() { * * @param parent Required. The project and location in which the live session should be created, * in the form of `projects/{project_number}/locations/{location}`. - *

Valid locations: - *

- * * @param liveSession Required. Parameters for creating a live session. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -2427,15 +2418,6 @@ public final LiveSession createLiveSession(LiveSessionName parent, LiveSession l * * @param parent Required. The project and location in which the live session should be created, * in the form of `projects/{project_number}/locations/{location}`. - *

Valid locations: - *

- * * @param liveSession Required. Parameters for creating a live session. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java b/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java index 18e11fa214f0..a1b4b96d5ab1 100644 --- a/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java +++ b/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java @@ -464,6 +464,7 @@ public void createVodSessionTest() throws Exception { .putAllAdTagMacroMap(new HashMap()) .setClientAdTracking(true) .setManifestOptions(ManifestOptions.newBuilder().build()) + .setAssetId("assetId-704776149") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -512,6 +513,7 @@ public void createVodSessionTest2() throws Exception { .putAllAdTagMacroMap(new HashMap()) .setClientAdTracking(true) .setManifestOptions(ManifestOptions.newBuilder().build()) + .setAssetId("assetId-704776149") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -560,6 +562,7 @@ public void getVodSessionTest() throws Exception { .putAllAdTagMacroMap(new HashMap()) .setClientAdTracking(true) .setManifestOptions(ManifestOptions.newBuilder().build()) + .setAssetId("assetId-704776149") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -605,6 +608,7 @@ public void getVodSessionTest2() throws Exception { .putAllAdTagMacroMap(new HashMap()) .setClientAdTracking(true) .setManifestOptions(ManifestOptions.newBuilder().build()) + .setAssetId("assetId-704776149") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -1544,6 +1548,7 @@ public void createLiveSessionTest() throws Exception { .setClientAdTracking(true) .setDefaultSlateId("defaultSlateId-122056941") .setManifestOptions(ManifestOptions.newBuilder().build()) + .setStreamId("streamId1790933179") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -1593,6 +1598,7 @@ public void createLiveSessionTest2() throws Exception { .setClientAdTracking(true) .setDefaultSlateId("defaultSlateId-122056941") .setManifestOptions(ManifestOptions.newBuilder().build()) + .setStreamId("streamId1790933179") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -1642,6 +1648,7 @@ public void getLiveSessionTest() throws Exception { .setClientAdTracking(true) .setDefaultSlateId("defaultSlateId-122056941") .setManifestOptions(ManifestOptions.newBuilder().build()) + .setStreamId("streamId1790933179") .build(); mockVideoStitcherService.addResponse(expectedResponse); @@ -1688,6 +1695,7 @@ public void getLiveSessionTest2() throws Exception { .setClientAdTracking(true) .setDefaultSlateId("defaultSlateId-122056941") .setManifestOptions(ManifestOptions.newBuilder().build()) + .setStreamId("streamId1790933179") .build(); mockVideoStitcherService.addResponse(expectedResponse); diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/clirr-ignored-differences.xml b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/clirr-ignored-differences.xml index 18af263eccd5..1dbc8869d497 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/clirr-ignored-differences.xml +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/clirr-ignored-differences.xml @@ -16,4 +16,14 @@ com/google/cloud/video/stitcher/v1/*OrBuilder boolean has*(*) + + 6001 + com/google/cloud/video/stitcher/v1/LiveSession$StitchingPolicy + COMPLETE_POD + + + 6011 + com/google/cloud/video/stitcher/v1/LiveSession$StitchingPolicy + COMPLETE_POD_VALUE + diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequest.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequest.java index 12b282212bbf..08b7a2b9698d 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequest.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequest.java @@ -137,13 +137,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * 
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    *
* * @@ -170,13 +163,6 @@ public java.lang.String getParent() { * 
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    *
* * @@ -606,13 +592,6 @@ public Builder mergeFrom( * 
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      *
* * @@ -638,13 +617,6 @@ public java.lang.String getParent() { * 
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      *
* * @@ -670,13 +642,6 @@ public com.google.protobuf.ByteString getParentBytes() { * 
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      *
* * @@ -701,13 +666,6 @@ public Builder setParent(java.lang.String value) { * 
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      *
* * @@ -728,13 +686,6 @@ public Builder clearParent() { * 
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      *
* * diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequestOrBuilder.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequestOrBuilder.java index 8d56c27c68d6..3333d78e0b07 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequestOrBuilder.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequestOrBuilder.java @@ -29,13 +29,6 @@ public interface CreateLiveSessionRequestOrBuilder * 
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    *
* * @@ -51,13 +44,6 @@ public interface CreateLiveSessionRequestOrBuilder * 
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    *
* * diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java index 8b080ad3279d..052b9cc188a6 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java @@ -44,6 +44,7 @@ private LiveSession() { defaultAdTagId_ = ""; defaultSlateId_ = ""; stitchingPolicy_ = 0; + streamId_ = ""; } @java.lang.Override @@ -170,6 +171,13 @@ private LiveSession( manifestOptions_ = subBuilder.buildPartial(); } + break; + } + case 90: + { + java.lang.String s = input.readStringRequireUtf8(); + + streamId_ = s; break; } default: @@ -252,16 +260,6 @@ public enum StitchingPolicy implements com.google.protobuf.ProtocolMessageEnum { * COMPLETE_AD = 1; */ COMPLETE_AD(1), - /** - * - * - * 
-     * Finishes stitching the current pod before returning to content.
-     *
- * - * COMPLETE_POD = 2; - */ - COMPLETE_POD(2), /** * * @@ -295,16 +293,6 @@ public enum StitchingPolicy implements com.google.protobuf.ProtocolMessageEnum { * COMPLETE_AD = 1; */ public static final int COMPLETE_AD_VALUE = 1; - /** - * - * - * 
-     * Finishes stitching the current pod before returning to content.
-     *
- * - * COMPLETE_POD = 2; - */ - public static final int COMPLETE_POD_VALUE = 2; /** * * @@ -344,8 +332,6 @@ public static StitchingPolicy forNumber(int value) { return STITCHING_POLICY_UNSPECIFIED; case 1: return COMPLETE_AD; - case 2: - return COMPLETE_POD; case 3: return CUT_CURRENT; default: @@ -1014,6 +1000,55 @@ public com.google.cloud.video.stitcher.v1.ManifestOptionsOrBuilder getManifestOp return getManifestOptions(); } + public static final int STREAM_ID_FIELD_NUMBER = 11; + private volatile java.lang.Object streamId_; + /** + * + * + * 
+   * Output only. The generated ID of the LiveSession's source stream.
+   *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The streamId. + */ + @java.lang.Override + public java.lang.String getStreamId() { + java.lang.Object ref = streamId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + streamId_ = s; + return s; + } + } + /** + * + * + * 
+   * Output only. The generated ID of the LiveSession's source stream.
+   *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The bytes for streamId. + */ + @java.lang.Override + public com.google.protobuf.ByteString getStreamIdBytes() { + java.lang.Object ref = streamId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + streamId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -1059,6 +1094,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (manifestOptions_ != null) { output.writeMessage(10, getManifestOptions()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(streamId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 11, streamId_); + } unknownFields.writeTo(output); } @@ -1116,6 +1154,9 @@ public int getSerializedSize() { if (manifestOptions_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getManifestOptions()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(streamId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, streamId_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1145,6 +1186,7 @@ public boolean equals(final java.lang.Object obj) { if (hasManifestOptions()) { if (!getManifestOptions().equals(other.getManifestOptions())) return false; } + if (!getStreamId().equals(other.getStreamId())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1182,6 +1224,8 @@ public int hashCode() { hash = (37 * hash) + MANIFEST_OPTIONS_FIELD_NUMBER; hash = (53 * hash) + getManifestOptions().hashCode(); } + hash = (37 * hash) + STREAM_ID_FIELD_NUMBER; + hash = (53 * hash) + getStreamId().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1373,6 +1417,8 @@ public Builder clear() { manifestOptions_ = null; manifestOptionsBuilder_ = null; } + streamId_ = ""; + return this; } @@ -1417,6 +1463,7 @@ public com.google.cloud.video.stitcher.v1.LiveSession buildPartial() { } else { result.manifestOptions_ = manifestOptionsBuilder_.build(); } + result.streamId_ = streamId_; onBuilt(); return result; } @@ -1497,6 +1544,10 @@ public Builder mergeFrom(com.google.cloud.video.stitcher.v1.LiveSession other) { if (other.hasManifestOptions()) { mergeManifestOptions(other.getManifestOptions()); } + if (!other.getStreamId().isEmpty()) { + streamId_ = other.streamId_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -2836,6 +2887,112 @@ public com.google.cloud.video.stitcher.v1.ManifestOptions.Builder getManifestOpt return manifestOptionsBuilder_; } + private java.lang.Object streamId_ = ""; + /** + * + * + * 
+     * Output only. The generated ID of the LiveSession's source stream.
+     *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The streamId. + */ + public java.lang.String getStreamId() { + java.lang.Object ref = streamId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + streamId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Output only. The generated ID of the LiveSession's source stream.
+     *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The bytes for streamId. + */ + public com.google.protobuf.ByteString getStreamIdBytes() { + java.lang.Object ref = streamId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + streamId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Output only. The generated ID of the LiveSession's source stream.
+     *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @param value The streamId to set. + * @return This builder for chaining. + */ + public Builder setStreamId(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + streamId_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. The generated ID of the LiveSession's source stream.
+     *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return This builder for chaining. + */ + public Builder clearStreamId() { + + streamId_ = getDefaultInstance().getStreamId(); + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. The generated ID of the LiveSession's source stream.
+     *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @param value The bytes for streamId to set. + * @return This builder for chaining. + */ + public Builder setStreamIdBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + streamId_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSessionOrBuilder.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSessionOrBuilder.java index 62023beab02b..3c431bde76cb 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSessionOrBuilder.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSessionOrBuilder.java @@ -402,4 +402,29 @@ java.lang.String getAdTagMacrosOrDefault( * .google.cloud.video.stitcher.v1.ManifestOptions manifest_options = 10; */ com.google.cloud.video.stitcher.v1.ManifestOptionsOrBuilder getManifestOptionsOrBuilder(); + + /** + * + * + * 
+   * Output only. The generated ID of the LiveSession's source stream.
+   *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The streamId. + */ + java.lang.String getStreamId(); + /** + * + * + * 
+   * Output only. The generated ID of the LiveSession's source stream.
+   *
+ * + * string stream_id = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The bytes for streamId. + */ + com.google.protobuf.ByteString getStreamIdBytes(); } diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/SessionsProto.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/SessionsProto.java index 7d91c736a793..2c1cde44ef29 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/SessionsProto.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/SessionsProto.java @@ -90,7 +90,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "/api/resource.proto\032/google/cloud/video/" + "stitcher/v1/companions.proto\032+google/clo" + "ud/video/stitcher/v1/events.proto\032\036googl" - + "e/protobuf/duration.proto\"\232\004\n\nVodSession" + + "e/protobuf/duration.proto\"\261\004\n\nVodSession" + "\022\021\n\004name\030\001 \001(\tB\003\340A\003\022I\n\rinterstitials\030\002 \001" + "(\0132-.google.cloud.video.stitcher.v1.Inte" + "rstitialsB\003\340A\003\022\025\n\010play_uri\030\004 \001(\tB\003\340A\003\022\027\n" @@ -99,62 +99,62 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "le.cloud.video.stitcher.v1.VodSession.Ad" + "TagMacroMapEntry\022\032\n\022client_ad_tracking\030\010" + " \001(\010\022I\n\020manifest_options\030\t \001(\0132/.google." - + "cloud.video.stitcher.v1.ManifestOptions\032" - + "4\n\022AdTagMacroMapEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" - + "lue\030\002 \001(\t:\0028\001:o\352Al\n\'videostitcher.google" - + "apis.com/VodSession\022Aprojects/{project}/" - + "locations/{location}/vodSessions/{vod_se" - + "ssion}\"\241\001\n\rInterstitials\022D\n\tad_breaks\030\001 " - + "\003(\01321.google.cloud.video.stitcher.v1.Vod" - + "SessionAdBreak\022J\n\017session_content\030\002 \001(\0132" - + "1.google.cloud.video.stitcher.v1.VodSess" - + "ionContent\"\300\001\n\014VodSessionAd\022+\n\010duration\030" - + "\001 \001(\0132\031.google.protobuf.Duration\022C\n\rcomp" - + "anion_ads\030\002 \001(\0132,.google.cloud.video.sti" - + "tcher.v1.CompanionAds\022>\n\017activity_events" - + "\030\003 \003(\0132%.google.cloud.video.stitcher.v1." - + "Event\"@\n\021VodSessionContent\022+\n\010duration\030\001" - + " \001(\0132\031.google.protobuf.Duration\"\200\002\n\021VodS" - + "essionAdBreak\022F\n\017progress_events\030\001 \003(\0132-" - + ".google.cloud.video.stitcher.v1.Progress" - + "Event\0229\n\003ads\030\002 \003(\0132,.google.cloud.video." - + "stitcher.v1.VodSessionAd\0222\n\017end_time_off" - + "set\030\003 \001(\0132\031.google.protobuf.Duration\0224\n\021" - + "start_time_offset\030\004 \001(\0132\031.google.protobu" - + "f.Duration\"\313\006\n\013LiveSession\022\021\n\004name\030\001 \001(\t" - + "B\003\340A\003\022\025\n\010play_uri\030\002 \001(\tB\003\340A\003\022\022\n\nsource_u" - + "ri\030\003 \001(\t\022\031\n\021default_ad_tag_id\030\004 \001(\t\022M\n\na" - + "d_tag_map\030\005 \003(\01329.google.cloud.video.sti" - + "tcher.v1.LiveSession.AdTagMapEntry\022S\n\rad" - + "_tag_macros\030\006 \003(\0132<.google.cloud.video.s" - + "titcher.v1.LiveSession.AdTagMacrosEntry\022" - + "\032\n\022client_ad_tracking\030\007 \001(\010\022\030\n\020default_s" - + "late_id\030\010 \001(\t\022U\n\020stitching_policy\030\t \001(\0162" - + ";.google.cloud.video.stitcher.v1.LiveSes" - + "sion.StitchingPolicy\022I\n\020manifest_options" - + "\030\n \001(\0132/.google.cloud.video.stitcher.v1." - + "ManifestOptions\032V\n\rAdTagMapEntry\022\013\n\003key\030" - + "\001 \001(\t\0224\n\005value\030\002 \001(\0132%.google.cloud.vide" - + "o.stitcher.v1.AdTag:\0028\001\0322\n\020AdTagMacrosEn" - + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"g\n\017S" - + "titchingPolicy\022 \n\034STITCHING_POLICY_UNSPE" - + "CIFIED\020\000\022\017\n\013COMPLETE_AD\020\001\022\020\n\014COMPLETE_PO" - + "D\020\002\022\017\n\013CUT_CURRENT\020\003:r\352Ao\n(videostitcher" - + ".googleapis.com/LiveSession\022Cprojects/{p" - + "roject}/locations/{location}/liveSession" - + "s/{live_session}\"\024\n\005AdTag\022\013\n\003uri\030\001 \001(\t\"\376" - + "\001\n\017ManifestOptions\022K\n\022include_renditions" - + "\030\001 \003(\0132/.google.cloud.video.stitcher.v1." - + "RenditionFilter\022R\n\rbitrate_order\030\002 \001(\0162;" - + ".google.cloud.video.stitcher.v1.Manifest" - + "Options.OrderPolicy\"J\n\013OrderPolicy\022\034\n\030OR" - + "DER_POLICY_UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022" - + "\016\n\nDESCENDING\020\002\"6\n\017RenditionFilter\022\023\n\013bi" - + "trate_bps\030\001 \001(\005\022\016\n\006codecs\030\002 \001(\tB}\n\"com.g" - + "oogle.cloud.video.stitcher.v1B\rSessionsP" - + "rotoP\001ZFgoogle.golang.org/genproto/googl" - + "eapis/cloud/video/stitcher/v1;stitcherb\006" - + "proto3" + + "cloud.video.stitcher.v1.ManifestOptions\022" + + "\025\n\010asset_id\030\n \001(\tB\003\340A\003\0324\n\022AdTagMacroMapE" + + "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:o\352A" + + "l\n\'videostitcher.googleapis.com/VodSessi" + + "on\022Aprojects/{project}/locations/{locati" + + "on}/vodSessions/{vod_session}\"\241\001\n\rInters" + + "titials\022D\n\tad_breaks\030\001 \003(\01321.google.clou" + + "d.video.stitcher.v1.VodSessionAdBreak\022J\n" + + "\017session_content\030\002 \001(\01321.google.cloud.vi" + + "deo.stitcher.v1.VodSessionContent\"\300\001\n\014Vo" + + "dSessionAd\022+\n\010duration\030\001 \001(\0132\031.google.pr" + + "otobuf.Duration\022C\n\rcompanion_ads\030\002 \001(\0132," + + ".google.cloud.video.stitcher.v1.Companio" + + "nAds\022>\n\017activity_events\030\003 \003(\0132%.google.c" + + "loud.video.stitcher.v1.Event\"@\n\021VodSessi" + + "onContent\022+\n\010duration\030\001 \001(\0132\031.google.pro" + + "tobuf.Duration\"\200\002\n\021VodSessionAdBreak\022F\n\017" + + "progress_events\030\001 \003(\0132-.google.cloud.vid" + + "eo.stitcher.v1.ProgressEvent\0229\n\003ads\030\002 \003(" + + "\0132,.google.cloud.video.stitcher.v1.VodSe" + + "ssionAd\0222\n\017end_time_offset\030\003 \001(\0132\031.googl" + + "e.protobuf.Duration\0224\n\021start_time_offset" + + "\030\004 \001(\0132\031.google.protobuf.Duration\"\321\006\n\013Li" + + "veSession\022\021\n\004name\030\001 \001(\tB\003\340A\003\022\025\n\010play_uri" + + "\030\002 \001(\tB\003\340A\003\022\022\n\nsource_uri\030\003 \001(\t\022\031\n\021defau" + + "lt_ad_tag_id\030\004 \001(\t\022M\n\nad_tag_map\030\005 \003(\01329" + + ".google.cloud.video.stitcher.v1.LiveSess" + + "ion.AdTagMapEntry\022S\n\rad_tag_macros\030\006 \003(\013" + + "2<.google.cloud.video.stitcher.v1.LiveSe" + + "ssion.AdTagMacrosEntry\022\032\n\022client_ad_trac" + + "king\030\007 \001(\010\022\030\n\020default_slate_id\030\010 \001(\t\022U\n\020" + + "stitching_policy\030\t \001(\0162;.google.cloud.vi" + + "deo.stitcher.v1.LiveSession.StitchingPol" + + "icy\022I\n\020manifest_options\030\n \001(\0132/.google.c" + + "loud.video.stitcher.v1.ManifestOptions\022\026" + + "\n\tstream_id\030\013 \001(\tB\003\340A\003\032V\n\rAdTagMapEntry\022" + + "\013\n\003key\030\001 \001(\t\0224\n\005value\030\002 \001(\0132%.google.clo" + + "ud.video.stitcher.v1.AdTag:\0028\001\0322\n\020AdTagM" + + "acrosEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" + + "8\001\"U\n\017StitchingPolicy\022 \n\034STITCHING_POLIC" + + "Y_UNSPECIFIED\020\000\022\017\n\013COMPLETE_AD\020\001\022\017\n\013CUT_" + + "CURRENT\020\003:r\352Ao\n(videostitcher.googleapis" + + ".com/LiveSession\022Cprojects/{project}/loc" + + "ations/{location}/liveSessions/{live_ses" + + "sion}\"\024\n\005AdTag\022\013\n\003uri\030\001 \001(\t\"\376\001\n\017Manifest" + + "Options\022K\n\022include_renditions\030\001 \003(\0132/.go" + + "ogle.cloud.video.stitcher.v1.RenditionFi" + + "lter\022R\n\rbitrate_order\030\002 \001(\0162;.google.clo" + + "ud.video.stitcher.v1.ManifestOptions.Ord" + + "erPolicy\"J\n\013OrderPolicy\022\034\n\030ORDER_POLICY_" + + "UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDI" + + "NG\020\002\"6\n\017RenditionFilter\022\023\n\013bitrate_bps\030\001" + + " \001(\005\022\016\n\006codecs\030\002 \001(\tB}\n\"com.google.cloud" + + ".video.stitcher.v1B\rSessionsProtoP\001ZFgoo" + + "gle.golang.org/genproto/googleapis/cloud" + + "/video/stitcher/v1;stitcherb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -180,6 +180,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AdTagMacroMap", "ClientAdTracking", "ManifestOptions", + "AssetId", }); internal_static_google_cloud_video_stitcher_v1_VodSession_AdTagMacroMapEntry_descriptor = internal_static_google_cloud_video_stitcher_v1_VodSession_descriptor @@ -239,6 +240,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DefaultSlateId", "StitchingPolicy", "ManifestOptions", + "StreamId", }); internal_static_google_cloud_video_stitcher_v1_LiveSession_AdTagMapEntry_descriptor = internal_static_google_cloud_video_stitcher_v1_LiveSession_descriptor diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java index 5c0ef3479637..cb51fd85b327 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java @@ -147,192 +147,190 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ud/video/stitcher/v1/sessions.proto\032+goo" + "gle/cloud/video/stitcher/v1/slates.proto" + "\0323google/cloud/video/stitcher/v1/stitch_" - + "details.proto\032\036google/protobuf/duration." - + "proto\032\033google/protobuf/empty.proto\032 goog" - + "le/protobuf/field_mask.proto\032\037google/pro" - + "tobuf/timestamp.proto\"\251\001\n\023CreateCdnKeyRe" - + "quest\022;\n\006parent\030\001 \001(\tB+\340A\002\372A%\022#videostit" - + "cher.googleapis.com/CdnKey\022<\n\007cdn_key\030\002 " - + "\001(\0132&.google.cloud.video.stitcher.v1.Cdn" - + "KeyB\003\340A\002\022\027\n\ncdn_key_id\030\003 \001(\tB\003\340A\002\"\232\001\n\022Li" - + "stCdnKeysRequest\022;\n\006parent\030\001 \001(\tB+\340A\002\372A%" - + "\022#videostitcher.googleapis.com/CdnKey\022\021\n" - + "\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006" - + "filter\030\004 \001(\t\022\020\n\010order_by\030\005 \001(\t\"}\n\023ListCd" - + "nKeysResponse\0228\n\010cdn_keys\030\001 \003(\0132&.google" - + ".cloud.video.stitcher.v1.CdnKey\022\027\n\017next_" - + "page_token\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(\t\"M\n" - + "\020GetCdnKeyRequest\0229\n\004name\030\001 \001(\tB+\340A\002\372A%\n" - + "#videostitcher.googleapis.com/CdnKey\"P\n\023" - + "DeleteCdnKeyRequest\0229\n\004name\030\001 \001(\tB+\340A\002\372A" - + "%\n#videostitcher.googleapis.com/CdnKey\"\211" - + "\001\n\023UpdateCdnKeyRequest\022<\n\007cdn_key\030\001 \001(\0132" - + "&.google.cloud.video.stitcher.v1.CdnKeyB" - + "\003\340A\002\0224\n\013update_mask\030\002 \001(\0132\032.google.proto" - + "buf.FieldMaskB\003\340A\002\"\240\001\n\027CreateVodSessionR" - + "equest\022?\n\006parent\030\001 \001(\tB/\340A\002\372A)\022\'videosti" - + "tcher.googleapis.com/VodSession\022D\n\013vod_s" - + "ession\030\002 \001(\0132*.google.cloud.video.stitch" - + "er.v1.VodSessionB\003\340A\002\"U\n\024GetVodSessionRe" - + "quest\022=\n\004name\030\001 \001(\tB/\340A\002\372A)\n\'videostitch" - + "er.googleapis.com/VodSession\"\212\001\n\033ListVod" - + "StitchDetailsRequest\022D\n\006parent\030\001 \001(\tB4\340A" - + "\002\372A.\022,videostitcher.googleapis.com/VodSt" - + "itchDetail\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_to" - + "ken\030\003 \001(\t\"\204\001\n\034ListVodStitchDetailsRespon" - + "se\022K\n\022vod_stitch_details\030\001 \003(\0132/.google." - + "cloud.video.stitcher.v1.VodStitchDetail\022" - + "\027\n\017next_page_token\030\002 \001(\t\"_\n\031GetVodStitch" - + "DetailRequest\022B\n\004name\030\001 \001(\tB4\340A\002\372A.\n,vid" - + "eostitcher.googleapis.com/VodStitchDetai" - + "l\"\210\001\n\032ListVodAdTagDetailsRequest\022C\n\006pare" - + "nt\030\001 \001(\tB3\340A\002\372A-\022+videostitcher.googleap" - + "is.com/VodAdTagDetail\022\021\n\tpage_size\030\002 \001(\005" - + "\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033ListVodAdTagDet" - + "ailsResponse\022J\n\022vod_ad_tag_details\030\001 \003(\013" - + "2..google.cloud.video.stitcher.v1.VodAdT" - + "agDetail\022\027\n\017next_page_token\030\002 \001(\t\"]\n\030Get" - + "VodAdTagDetailRequest\022A\n\004name\030\001 \001(\tB3\340A\002" - + "\372A-\n+videostitcher.googleapis.com/VodAdT" - + "agDetail\"\212\001\n\033ListLiveAdTagDetailsRequest" - + "\022D\n\006parent\030\001 \001(\tB4\340A\002\372A.\022,videostitcher." - + "googleapis.com/LiveAdTagDetail\022\021\n\tpage_s" - + "ize\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\205\001\n\034ListLi" - + "veAdTagDetailsResponse\022L\n\023live_ad_tag_de" - + "tails\030\001 \003(\0132/.google.cloud.video.stitche" - + "r.v1.LiveAdTagDetail\022\027\n\017next_page_token\030" - + "\002 \001(\t\"_\n\031GetLiveAdTagDetailRequest\022B\n\004na" - + "me\030\001 \001(\tB4\340A\002\372A.\n,videostitcher.googleap" - + "is.com/LiveAdTagDetail\"\242\001\n\022CreateSlateRe" - + "quest\022:\n\006parent\030\001 \001(\tB*\340A\002\372A$\022\"videostit" - + "cher.googleapis.com/Slate\022\025\n\010slate_id\030\002 " - + "\001(\tB\003\340A\002\0229\n\005slate\030\003 \001(\0132%.google.cloud.v" - + "ideo.stitcher.v1.SlateB\003\340A\002\"K\n\017GetSlateR" - + "equest\0228\n\004name\030\001 \001(\tB*\340A\002\372A$\n\"videostitc" - + "her.googleapis.com/Slate\"\230\001\n\021ListSlatesR" - + "equest\022:\n\006parent\030\001 \001(\tB*\340A\002\372A$\022\"videosti" - + "tcher.googleapis.com/Slate\022\021\n\tpage_size\030" - + "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(" - + "\t\022\020\n\010order_by\030\005 \001(\t\"y\n\022ListSlatesRespons" - + "e\0225\n\006slates\030\001 \003(\0132%.google.cloud.video.s" - + "titcher.v1.Slate\022\027\n\017next_page_token\030\002 \001(" - + "\t\022\023\n\013unreachable\030\003 \003(\t\"\205\001\n\022UpdateSlateRe" - + "quest\0229\n\005slate\030\001 \001(\0132%.google.cloud.vide" - + "o.stitcher.v1.SlateB\003\340A\002\0224\n\013update_mask\030" - + "\002 \001(\0132\032.google.protobuf.FieldMaskB\003\340A\002\"N" - + "\n\022DeleteSlateRequest\0228\n\004name\030\001 \001(\tB*\340A\002\372" - + "A$\n\"videostitcher.googleapis.com/Slate\"\244" - + "\001\n\030CreateLiveSessionRequest\022@\n\006parent\030\001 " - + "\001(\tB0\340A\002\372A*\n(videostitcher.googleapis.co" - + "m/LiveSession\022F\n\014live_session\030\002 \001(\0132+.go" - + "ogle.cloud.video.stitcher.v1.LiveSession" - + "B\003\340A\002\"W\n\025GetLiveSessionRequest\022>\n\004name\030\001" - + " \001(\tB0\340A\002\372A*\n(videostitcher.googleapis.c" - + "om/LiveSession2\252\037\n\024VideoStitcherService\022" - + "\305\001\n\014CreateCdnKey\0223.google.cloud.video.st" - + "itcher.v1.CreateCdnKeyRequest\032&.google.c" - + "loud.video.stitcher.v1.CdnKey\"X\202\323\344\223\0026\"+/" - + "v1/{parent=projects/*/locations/*}/cdnKe" - + "ys:\007cdn_key\332A\031parent,cdn_key,cdn_key_id\022" - + "\264\001\n\013ListCdnKeys\0222.google.cloud.video.sti" - + "tcher.v1.ListCdnKeysRequest\0323.google.clo" - + "ud.video.stitcher.v1.ListCdnKeysResponse" - + "\"<\202\323\344\223\002-\022+/v1/{parent=projects/*/locatio" - + "ns/*}/cdnKeys\332A\006parent\022\241\001\n\tGetCdnKey\0220.g" - + "oogle.cloud.video.stitcher.v1.GetCdnKeyR" - + "equest\032&.google.cloud.video.stitcher.v1." - + "CdnKey\":\202\323\344\223\002-\022+/v1/{name=projects/*/loc" - + "ations/*/cdnKeys/*}\332A\004name\022\227\001\n\014DeleteCdn" - + "Key\0223.google.cloud.video.stitcher.v1.Del" - + "eteCdnKeyRequest\032\026.google.protobuf.Empty" - + "\":\202\323\344\223\002-*+/v1/{name=projects/*/locations" - + "/*/cdnKeys/*}\332A\004name\022\307\001\n\014UpdateCdnKey\0223." - + "google.cloud.video.stitcher.v1.UpdateCdn" - + "KeyRequest\032&.google.cloud.video.stitcher" - + ".v1.CdnKey\"Z\202\323\344\223\002>23/v1/{cdn_key.name=pr" - + "ojects/*/locations/*/cdnKeys/*}:\007cdn_key" - + "\332A\023cdn_key,update_mask\022\322\001\n\020CreateVodSess" - + "ion\0227.google.cloud.video.stitcher.v1.Cre" - + "ateVodSessionRequest\032*.google.cloud.vide" - + "o.stitcher.v1.VodSession\"Y\202\323\344\223\002>\"//v1/{p" - + "arent=projects/*/locations/*}/vodSession" - + "s:\013vod_session\332A\022parent,vod_session\022\261\001\n\r" - + "GetVodSession\0224.google.cloud.video.stitc" - + "her.v1.GetVodSessionRequest\032*.google.clo" - + "ud.video.stitcher.v1.VodSession\">\202\323\344\223\0021\022" - + "//v1/{name=projects/*/locations/*/vodSes" - + "sions/*}\332A\004name\022\346\001\n\024ListVodStitchDetails" - + "\022;.google.cloud.video.stitcher.v1.ListVo" - + "dStitchDetailsRequest\032<.google.cloud.vid" - + "eo.stitcher.v1.ListVodStitchDetailsRespo" - + "nse\"S\202\323\344\223\002D\022B/v1/{parent=projects/*/loca" - + "tions/*/vodSessions/*}/vodStitchDetails\332" - + "A\006parent\022\323\001\n\022GetVodStitchDetail\0229.google" - + ".cloud.video.stitcher.v1.GetVodStitchDet" - + "ailRequest\032/.google.cloud.video.stitcher" - + ".v1.VodStitchDetail\"Q\202\323\344\223\002D\022B/v1/{name=p" - + "rojects/*/locations/*/vodSessions/*/vodS" - + "titchDetails/*}\332A\004name\022\342\001\n\023ListVodAdTagD" - + "etails\022:.google.cloud.video.stitcher.v1." - + "ListVodAdTagDetailsRequest\032;.google.clou" - + "d.video.stitcher.v1.ListVodAdTagDetailsR" - + "esponse\"R\202\323\344\223\002C\022A/v1/{parent=projects/*/" - + "locations/*/vodSessions/*}/vodAdTagDetai" - + "ls\332A\006parent\022\317\001\n\021GetVodAdTagDetail\0228.goog" - + "le.cloud.video.stitcher.v1.GetVodAdTagDe" - + "tailRequest\032..google.cloud.video.stitche" - + "r.v1.VodAdTagDetail\"P\202\323\344\223\002C\022A/v1/{name=p" - + "rojects/*/locations/*/vodSessions/*/vodA" - + "dTagDetails/*}\332A\004name\022\347\001\n\024ListLiveAdTagD" - + "etails\022;.google.cloud.video.stitcher.v1." - + "ListLiveAdTagDetailsRequest\032<.google.clo" - + "ud.video.stitcher.v1.ListLiveAdTagDetail" - + "sResponse\"T\202\323\344\223\002E\022C/v1/{parent=projects/" - + "*/locations/*/liveSessions/*}/liveAdTagD" - + "etails\332A\006parent\022\324\001\n\022GetLiveAdTagDetail\0229" - + ".google.cloud.video.stitcher.v1.GetLiveA" - + "dTagDetailRequest\032/.google.cloud.video.s" - + "titcher.v1.LiveAdTagDetail\"R\202\323\344\223\002E\022C/v1/" - + "{name=projects/*/locations/*/liveSession" - + "s/*/liveAdTagDetails/*}\332A\004name\022\273\001\n\013Creat" - + "eSlate\0222.google.cloud.video.stitcher.v1." - + "CreateSlateRequest\032%.google.cloud.video." - + "stitcher.v1.Slate\"Q\202\323\344\223\0023\"*/v1/{parent=p" - + "rojects/*/locations/*}/slates:\005slate\332A\025p" - + "arent,slate,slate_id\022\260\001\n\nListSlates\0221.go" - + "ogle.cloud.video.stitcher.v1.ListSlatesR" - + "equest\0322.google.cloud.video.stitcher.v1." - + "ListSlatesResponse\";\202\323\344\223\002,\022*/v1/{parent=" - + "projects/*/locations/*}/slates\332A\006parent\022" - + "\235\001\n\010GetSlate\022/.google.cloud.video.stitch" - + "er.v1.GetSlateRequest\032%.google.cloud.vid" - + "eo.stitcher.v1.Slate\"9\202\323\344\223\002,\022*/v1/{name=" - + "projects/*/locations/*/slates/*}\332A\004name\022" - + "\275\001\n\013UpdateSlate\0222.google.cloud.video.sti" - + "tcher.v1.UpdateSlateRequest\032%.google.clo" - + "ud.video.stitcher.v1.Slate\"S\202\323\344\223\002920/v1/" - + "{slate.name=projects/*/locations/*/slate" - + "s/*}:\005slate\332A\021slate,update_mask\022\224\001\n\013Dele" - + "teSlate\0222.google.cloud.video.stitcher.v1" - + ".DeleteSlateRequest\032\026.google.protobuf.Em" - + "pty\"9\202\323\344\223\002,**/v1/{name=projects/*/locati" - + "ons/*/slates/*}\332A\004name\022\330\001\n\021CreateLiveSes" - + "sion\0228.google.cloud.video.stitcher.v1.Cr" - + "eateLiveSessionRequest\032+.google.cloud.vi" - + "deo.stitcher.v1.LiveSession\"\\\202\323\344\223\002@\"0/v1" - + "/{parent=projects/*/locations/*}/liveSes" - + "sions:\014live_session\332A\023parent,live_sessio" - + "n\022\265\001\n\016GetLiveSession\0225.google.cloud.vide" - + "o.stitcher.v1.GetLiveSessionRequest\032+.go" - + "ogle.cloud.video.stitcher.v1.LiveSession" - + "\"?\202\323\344\223\0022\0220/v1/{name=projects/*/locations" - + "/*/liveSessions/*}\332A\004name\032P\312A\034videostitc" - + "her.googleapis.com\322A.https://www.googlea" - + "pis.com/auth/cloud-platformB\211\001\n\"com.goog" - + "le.cloud.video.stitcher.v1B\031VideoStitche" - + "rServiceProtoP\001ZFgoogle.golang.org/genpr" - + "oto/googleapis/cloud/video/stitcher/v1;s" - + "titcherb\006proto3" + + "details.proto\032\033google/protobuf/empty.pro" + + "to\032 google/protobuf/field_mask.proto\"\251\001\n" + + "\023CreateCdnKeyRequest\022;\n\006parent\030\001 \001(\tB+\340A" + + "\002\372A%\022#videostitcher.googleapis.com/CdnKe" + + "y\022<\n\007cdn_key\030\002 \001(\0132&.google.cloud.video." + + "stitcher.v1.CdnKeyB\003\340A\002\022\027\n\ncdn_key_id\030\003 " + + "\001(\tB\003\340A\002\"\232\001\n\022ListCdnKeysRequest\022;\n\006paren" + + "t\030\001 \001(\tB+\340A\002\372A%\022#videostitcher.googleapi" + + "s.com/CdnKey\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_" + + "token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\022\020\n\010order_by\030" + + "\005 \001(\t\"}\n\023ListCdnKeysResponse\0228\n\010cdn_keys" + + "\030\001 \003(\0132&.google.cloud.video.stitcher.v1." + + "CdnKey\022\027\n\017next_page_token\030\002 \001(\t\022\023\n\013unrea" + + "chable\030\003 \003(\t\"M\n\020GetCdnKeyRequest\0229\n\004name" + + "\030\001 \001(\tB+\340A\002\372A%\n#videostitcher.googleapis" + + ".com/CdnKey\"P\n\023DeleteCdnKeyRequest\0229\n\004na" + + "me\030\001 \001(\tB+\340A\002\372A%\n#videostitcher.googleap" + + "is.com/CdnKey\"\211\001\n\023UpdateCdnKeyRequest\022<\n" + + "\007cdn_key\030\001 \001(\0132&.google.cloud.video.stit" + + "cher.v1.CdnKeyB\003\340A\002\0224\n\013update_mask\030\002 \001(\013" + + "2\032.google.protobuf.FieldMaskB\003\340A\002\"\240\001\n\027Cr" + + "eateVodSessionRequest\022?\n\006parent\030\001 \001(\tB/\340" + + "A\002\372A)\022\'videostitcher.googleapis.com/VodS" + + "ession\022D\n\013vod_session\030\002 \001(\0132*.google.clo" + + "ud.video.stitcher.v1.VodSessionB\003\340A\002\"U\n\024" + + "GetVodSessionRequest\022=\n\004name\030\001 \001(\tB/\340A\002\372" + + "A)\n\'videostitcher.googleapis.com/VodSess" + + "ion\"\212\001\n\033ListVodStitchDetailsRequest\022D\n\006p" + + "arent\030\001 \001(\tB4\340A\002\372A.\022,videostitcher.googl" + + "eapis.com/VodStitchDetail\022\021\n\tpage_size\030\002" + + " \001(\005\022\022\n\npage_token\030\003 \001(\t\"\204\001\n\034ListVodStit" + + "chDetailsResponse\022K\n\022vod_stitch_details\030" + + "\001 \003(\0132/.google.cloud.video.stitcher.v1.V" + + "odStitchDetail\022\027\n\017next_page_token\030\002 \001(\t\"" + + "_\n\031GetVodStitchDetailRequest\022B\n\004name\030\001 \001" + + "(\tB4\340A\002\372A.\n,videostitcher.googleapis.com" + + "/VodStitchDetail\"\210\001\n\032ListVodAdTagDetails" + + "Request\022C\n\006parent\030\001 \001(\tB3\340A\002\372A-\022+videost" + + "itcher.googleapis.com/VodAdTagDetail\022\021\n\t" + + "page_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033" + + "ListVodAdTagDetailsResponse\022J\n\022vod_ad_ta" + + "g_details\030\001 \003(\0132..google.cloud.video.sti" + + "tcher.v1.VodAdTagDetail\022\027\n\017next_page_tok" + + "en\030\002 \001(\t\"]\n\030GetVodAdTagDetailRequest\022A\n\004" + + "name\030\001 \001(\tB3\340A\002\372A-\n+videostitcher.google" + + "apis.com/VodAdTagDetail\"\212\001\n\033ListLiveAdTa" + + "gDetailsRequest\022D\n\006parent\030\001 \001(\tB4\340A\002\372A.\022" + + ",videostitcher.googleapis.com/LiveAdTagD" + + "etail\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003" + + " \001(\t\"\205\001\n\034ListLiveAdTagDetailsResponse\022L\n" + + "\023live_ad_tag_details\030\001 \003(\0132/.google.clou" + + "d.video.stitcher.v1.LiveAdTagDetail\022\027\n\017n" + + "ext_page_token\030\002 \001(\t\"_\n\031GetLiveAdTagDeta" + + "ilRequest\022B\n\004name\030\001 \001(\tB4\340A\002\372A.\n,videost" + + "itcher.googleapis.com/LiveAdTagDetail\"\242\001" + + "\n\022CreateSlateRequest\022:\n\006parent\030\001 \001(\tB*\340A" + + "\002\372A$\022\"videostitcher.googleapis.com/Slate" + + "\022\025\n\010slate_id\030\002 \001(\tB\003\340A\002\0229\n\005slate\030\003 \001(\0132%" + + ".google.cloud.video.stitcher.v1.SlateB\003\340" + + "A\002\"K\n\017GetSlateRequest\0228\n\004name\030\001 \001(\tB*\340A\002" + + "\372A$\n\"videostitcher.googleapis.com/Slate\"" + + "\230\001\n\021ListSlatesRequest\022:\n\006parent\030\001 \001(\tB*\340" + + "A\002\372A$\022\"videostitcher.googleapis.com/Slat" + + "e\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t" + + "\022\016\n\006filter\030\004 \001(\t\022\020\n\010order_by\030\005 \001(\t\"y\n\022Li" + + "stSlatesResponse\0225\n\006slates\030\001 \003(\0132%.googl" + + "e.cloud.video.stitcher.v1.Slate\022\027\n\017next_" + + "page_token\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(\t\"\205\001" + + "\n\022UpdateSlateRequest\0229\n\005slate\030\001 \001(\0132%.go" + + "ogle.cloud.video.stitcher.v1.SlateB\003\340A\002\022" + + "4\n\013update_mask\030\002 \001(\0132\032.google.protobuf.F" + + "ieldMaskB\003\340A\002\"N\n\022DeleteSlateRequest\0228\n\004n" + + "ame\030\001 \001(\tB*\340A\002\372A$\n\"videostitcher.googlea" + + "pis.com/Slate\"\244\001\n\030CreateLiveSessionReque" + + "st\022@\n\006parent\030\001 \001(\tB0\340A\002\372A*\n(videostitche" + + "r.googleapis.com/LiveSession\022F\n\014live_ses" + + "sion\030\002 \001(\0132+.google.cloud.video.stitcher" + + ".v1.LiveSessionB\003\340A\002\"W\n\025GetLiveSessionRe" + + "quest\022>\n\004name\030\001 \001(\tB0\340A\002\372A*\n(videostitch" + + "er.googleapis.com/LiveSession2\252\037\n\024VideoS" + + "titcherService\022\305\001\n\014CreateCdnKey\0223.google" + + ".cloud.video.stitcher.v1.CreateCdnKeyReq" + + "uest\032&.google.cloud.video.stitcher.v1.Cd" + + "nKey\"X\202\323\344\223\0026\"+/v1/{parent=projects/*/loc" + + "ations/*}/cdnKeys:\007cdn_key\332A\031parent,cdn_" + + "key,cdn_key_id\022\264\001\n\013ListCdnKeys\0222.google." + + "cloud.video.stitcher.v1.ListCdnKeysReque" + + "st\0323.google.cloud.video.stitcher.v1.List" + + "CdnKeysResponse\"<\202\323\344\223\002-\022+/v1/{parent=pro" + + "jects/*/locations/*}/cdnKeys\332A\006parent\022\241\001" + + "\n\tGetCdnKey\0220.google.cloud.video.stitche" + + "r.v1.GetCdnKeyRequest\032&.google.cloud.vid" + + "eo.stitcher.v1.CdnKey\":\202\323\344\223\002-\022+/v1/{name" + + "=projects/*/locations/*/cdnKeys/*}\332A\004nam" + + "e\022\227\001\n\014DeleteCdnKey\0223.google.cloud.video." + + "stitcher.v1.DeleteCdnKeyRequest\032\026.google" + + ".protobuf.Empty\":\202\323\344\223\002-*+/v1/{name=proje" + + "cts/*/locations/*/cdnKeys/*}\332A\004name\022\307\001\n\014" + + "UpdateCdnKey\0223.google.cloud.video.stitch" + + "er.v1.UpdateCdnKeyRequest\032&.google.cloud" + + ".video.stitcher.v1.CdnKey\"Z\202\323\344\223\002>23/v1/{" + + "cdn_key.name=projects/*/locations/*/cdnK" + + "eys/*}:\007cdn_key\332A\023cdn_key,update_mask\022\322\001" + + "\n\020CreateVodSession\0227.google.cloud.video." + + "stitcher.v1.CreateVodSessionRequest\032*.go" + + "ogle.cloud.video.stitcher.v1.VodSession\"" + + "Y\202\323\344\223\002>\"//v1/{parent=projects/*/location" + + "s/*}/vodSessions:\013vod_session\332A\022parent,v" + + "od_session\022\261\001\n\rGetVodSession\0224.google.cl" + + "oud.video.stitcher.v1.GetVodSessionReque" + + "st\032*.google.cloud.video.stitcher.v1.VodS" + + "ession\">\202\323\344\223\0021\022//v1/{name=projects/*/loc" + + "ations/*/vodSessions/*}\332A\004name\022\346\001\n\024ListV" + + "odStitchDetails\022;.google.cloud.video.sti" + + "tcher.v1.ListVodStitchDetailsRequest\032<.g" + + "oogle.cloud.video.stitcher.v1.ListVodSti" + + "tchDetailsResponse\"S\202\323\344\223\002D\022B/v1/{parent=" + + "projects/*/locations/*/vodSessions/*}/vo" + + "dStitchDetails\332A\006parent\022\323\001\n\022GetVodStitch" + + "Detail\0229.google.cloud.video.stitcher.v1." + + "GetVodStitchDetailRequest\032/.google.cloud" + + ".video.stitcher.v1.VodStitchDetail\"Q\202\323\344\223" + + "\002D\022B/v1/{name=projects/*/locations/*/vod" + + "Sessions/*/vodStitchDetails/*}\332A\004name\022\342\001" + + "\n\023ListVodAdTagDetails\022:.google.cloud.vid" + + "eo.stitcher.v1.ListVodAdTagDetailsReques" + + "t\032;.google.cloud.video.stitcher.v1.ListV" + + "odAdTagDetailsResponse\"R\202\323\344\223\002C\022A/v1/{par" + + "ent=projects/*/locations/*/vodSessions/*" + + "}/vodAdTagDetails\332A\006parent\022\317\001\n\021GetVodAdT" + + "agDetail\0228.google.cloud.video.stitcher.v" + + "1.GetVodAdTagDetailRequest\032..google.clou" + + "d.video.stitcher.v1.VodAdTagDetail\"P\202\323\344\223" + + "\002C\022A/v1/{name=projects/*/locations/*/vod" + + "Sessions/*/vodAdTagDetails/*}\332A\004name\022\347\001\n" + + "\024ListLiveAdTagDetails\022;.google.cloud.vid" + + "eo.stitcher.v1.ListLiveAdTagDetailsReque" + + "st\032<.google.cloud.video.stitcher.v1.List" + + "LiveAdTagDetailsResponse\"T\202\323\344\223\002E\022C/v1/{p" + + "arent=projects/*/locations/*/liveSession" + + "s/*}/liveAdTagDetails\332A\006parent\022\324\001\n\022GetLi" + + "veAdTagDetail\0229.google.cloud.video.stitc" + + "her.v1.GetLiveAdTagDetailRequest\032/.googl" + + "e.cloud.video.stitcher.v1.LiveAdTagDetai" + + "l\"R\202\323\344\223\002E\022C/v1/{name=projects/*/location" + + "s/*/liveSessions/*/liveAdTagDetails/*}\332A" + + "\004name\022\273\001\n\013CreateSlate\0222.google.cloud.vid" + + "eo.stitcher.v1.CreateSlateRequest\032%.goog" + + "le.cloud.video.stitcher.v1.Slate\"Q\202\323\344\223\0023" + + "\"*/v1/{parent=projects/*/locations/*}/sl" + + "ates:\005slate\332A\025parent,slate,slate_id\022\260\001\n\n" + + "ListSlates\0221.google.cloud.video.stitcher" + + ".v1.ListSlatesRequest\0322.google.cloud.vid" + + "eo.stitcher.v1.ListSlatesResponse\";\202\323\344\223\002" + + ",\022*/v1/{parent=projects/*/locations/*}/s" + + "lates\332A\006parent\022\235\001\n\010GetSlate\022/.google.clo" + + "ud.video.stitcher.v1.GetSlateRequest\032%.g" + + "oogle.cloud.video.stitcher.v1.Slate\"9\202\323\344" + + "\223\002,\022*/v1/{name=projects/*/locations/*/sl" + + "ates/*}\332A\004name\022\275\001\n\013UpdateSlate\0222.google." + + "cloud.video.stitcher.v1.UpdateSlateReque" + + "st\032%.google.cloud.video.stitcher.v1.Slat" + + "e\"S\202\323\344\223\002920/v1/{slate.name=projects/*/lo" + + "cations/*/slates/*}:\005slate\332A\021slate,updat" + + "e_mask\022\224\001\n\013DeleteSlate\0222.google.cloud.vi" + + "deo.stitcher.v1.DeleteSlateRequest\032\026.goo" + + "gle.protobuf.Empty\"9\202\323\344\223\002,**/v1/{name=pr" + + "ojects/*/locations/*/slates/*}\332A\004name\022\330\001" + + "\n\021CreateLiveSession\0228.google.cloud.video" + + ".stitcher.v1.CreateLiveSessionRequest\032+." + + "google.cloud.video.stitcher.v1.LiveSessi" + + "on\"\\\202\323\344\223\002@\"0/v1/{parent=projects/*/locat" + + "ions/*}/liveSessions:\014live_session\332A\023par" + + "ent,live_session\022\265\001\n\016GetLiveSession\0225.go" + + "ogle.cloud.video.stitcher.v1.GetLiveSess" + + "ionRequest\032+.google.cloud.video.stitcher" + + ".v1.LiveSession\"?\202\323\344\223\0022\0220/v1/{name=proje" + + "cts/*/locations/*/liveSessions/*}\332A\004name" + + "\032P\312A\034videostitcher.googleapis.com\322A.http" + + "s://www.googleapis.com/auth/cloud-platfo" + + "rmB\211\001\n\"com.google.cloud.video.stitcher.v" + + "1B\031VideoStitcherServiceProtoP\001ZFgoogle.g" + + "olang.org/genproto/googleapis/cloud/vide" + + "o/stitcher/v1;stitcherb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -347,10 +345,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.cloud.video.stitcher.v1.SessionsProto.getDescriptor(), com.google.cloud.video.stitcher.v1.SlatesProto.getDescriptor(), com.google.cloud.video.stitcher.v1.StitchDetailsProto.getDescriptor(), - com.google.protobuf.DurationProto.getDescriptor(), com.google.protobuf.EmptyProto.getDescriptor(), com.google.protobuf.FieldMaskProto.getDescriptor(), - com.google.protobuf.TimestampProto.getDescriptor(), }); internal_static_google_cloud_video_stitcher_v1_CreateCdnKeyRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -571,10 +567,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.cloud.video.stitcher.v1.SessionsProto.getDescriptor(); com.google.cloud.video.stitcher.v1.SlatesProto.getDescriptor(); com.google.cloud.video.stitcher.v1.StitchDetailsProto.getDescriptor(); - com.google.protobuf.DurationProto.getDescriptor(); com.google.protobuf.EmptyProto.getDescriptor(); com.google.protobuf.FieldMaskProto.getDescriptor(); - com.google.protobuf.TimestampProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java index 8589b2380b76..351ca8734706 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java @@ -42,6 +42,7 @@ private VodSession() { playUri_ = ""; sourceUri_ = ""; adTagUri_ = ""; + assetId_ = ""; } @java.lang.Override @@ -155,6 +156,13 @@ private VodSession( manifestOptions_ = subBuilder.buildPartial(); } + break; + } + case 82: + { + java.lang.String s = input.readStringRequireUtf8(); + + assetId_ = s; break; } default: @@ -660,6 +668,55 @@ public com.google.cloud.video.stitcher.v1.ManifestOptionsOrBuilder getManifestOp return getManifestOptions(); } + public static final int ASSET_ID_FIELD_NUMBER = 10; + private volatile java.lang.Object assetId_; + /** + * + * + * 
+   * Output only. The generated ID of the VodSession's source media.
+   *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The assetId. + */ + @java.lang.Override + public java.lang.String getAssetId() { + java.lang.Object ref = assetId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + assetId_ = s; + return s; + } + } + /** + * + * + * 
+   * Output only. The generated ID of the VodSession's source media.
+   *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The bytes for assetId. + */ + @java.lang.Override + public com.google.protobuf.ByteString getAssetIdBytes() { + java.lang.Object ref = assetId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + assetId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -697,6 +754,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (manifestOptions_ != null) { output.writeMessage(9, getManifestOptions()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(assetId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 10, assetId_); + } unknownFields.writeTo(output); } @@ -737,6 +797,9 @@ public int getSerializedSize() { if (manifestOptions_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getManifestOptions()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(assetId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, assetId_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -767,6 +830,7 @@ public boolean equals(final java.lang.Object obj) { if (hasManifestOptions()) { if (!getManifestOptions().equals(other.getManifestOptions())) return false; } + if (!getAssetId().equals(other.getAssetId())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -800,6 +864,8 @@ public int hashCode() { hash = (37 * hash) + MANIFEST_OPTIONS_FIELD_NUMBER; hash = (53 * hash) + getManifestOptions().hashCode(); } + hash = (37 * hash) + ASSET_ID_FIELD_NUMBER; + hash = (53 * hash) + getAssetId().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -988,6 +1054,8 @@ public Builder clear() { manifestOptions_ = null; manifestOptionsBuilder_ = null; } + assetId_ = ""; + return this; } @@ -1033,6 +1101,7 @@ public com.google.cloud.video.stitcher.v1.VodSession buildPartial() { } else { result.manifestOptions_ = manifestOptionsBuilder_.build(); } + result.assetId_ = assetId_; onBuilt(); return result; } @@ -1108,6 +1177,10 @@ public Builder mergeFrom(com.google.cloud.video.stitcher.v1.VodSession other) { if (other.hasManifestOptions()) { mergeManifestOptions(other.getManifestOptions()); } + if (!other.getAssetId().isEmpty()) { + assetId_ = other.assetId_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -2243,6 +2316,112 @@ public com.google.cloud.video.stitcher.v1.ManifestOptions.Builder getManifestOpt return manifestOptionsBuilder_; } + private java.lang.Object assetId_ = ""; + /** + * + * + * 
+     * Output only. The generated ID of the VodSession's source media.
+     *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The assetId. + */ + public java.lang.String getAssetId() { + java.lang.Object ref = assetId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + assetId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Output only. The generated ID of the VodSession's source media.
+     *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The bytes for assetId. + */ + public com.google.protobuf.ByteString getAssetIdBytes() { + java.lang.Object ref = assetId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + assetId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Output only. The generated ID of the VodSession's source media.
+     *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @param value The assetId to set. + * @return This builder for chaining. + */ + public Builder setAssetId(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + assetId_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. The generated ID of the VodSession's source media.
+     *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return This builder for chaining. + */ + public Builder clearAssetId() { + + assetId_ = getDefaultInstance().getAssetId(); + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. The generated ID of the VodSession's source media.
+     *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @param value The bytes for assetId to set. + * @return This builder for chaining. + */ + public Builder setAssetIdBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + assetId_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java index 9e58090adb6b..51e7a20889fc 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java @@ -317,4 +317,29 @@ java.lang.String getAdTagMacroMapOrDefault( * .google.cloud.video.stitcher.v1.ManifestOptions manifest_options = 9; */ com.google.cloud.video.stitcher.v1.ManifestOptionsOrBuilder getManifestOptionsOrBuilder(); + + /** + * + * + * 
+   * Output only. The generated ID of the VodSession's source media.
+   *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The assetId. + */ + java.lang.String getAssetId(); + /** + * + * + * 
+   * Output only. The generated ID of the VodSession's source media.
+   *
+ * + * string asset_id = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * @return The bytes for assetId. + */ + com.google.protobuf.ByteString getAssetIdBytes(); } diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto index e7731f8dbd75..8bbbea806969 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto @@ -74,6 +74,9 @@ message VodSession { // Additional options that affect the output of the manifest. ManifestOptions manifest_options = 9; + + // Output only. The generated ID of the VodSession's source media. + string asset_id = 10 [(google.api.field_behavior) = OUTPUT_ONLY]; } // Describes what was stitched into a VOD session's manifest. @@ -139,9 +142,6 @@ message LiveSession { // Finishes stitching the current ad before returning to content. COMPLETE_AD = 1; - // Finishes stitching the current pod before returning to content. - COMPLETE_POD = 2; - // Cuts an ad short and returns to content in the middle of the ad. CUT_CURRENT = 3; } @@ -200,6 +200,9 @@ message LiveSession { // Additional options that affect the output of the manifest. ManifestOptions manifest_options = 10; + + // Output only. The generated ID of the LiveSession's source stream. + string stream_id = 11 [(google.api.field_behavior) = OUTPUT_ONLY]; } // Metadata of an ad tag. diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto index fda9233d17d5..938f01c8af61 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto @@ -25,10 +25,8 @@ import "google/cloud/video/stitcher/v1/cdn_keys.proto"; import "google/cloud/video/stitcher/v1/sessions.proto"; import "google/cloud/video/stitcher/v1/slates.proto"; import "google/cloud/video/stitcher/v1/stitch_details.proto"; -import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; -import "google/protobuf/timestamp.proto"; option go_package = "google.golang.org/genproto/googleapis/cloud/video/stitcher/v1;stitcher"; option java_multiple_files = true; @@ -548,15 +546,6 @@ message DeleteSlateRequest { message CreateLiveSessionRequest { // Required. The project and location in which the live session should be created, // in the form of `projects/{project_number}/locations/{location}`. - // - // Valid locations: - // - // * `-` (Video Stitcher API will pick a location that is closest to the - // caller.) - // * `us-east1` - // * `us-west1` - // * `us-central1` - // * `europe-west1` string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = {