tencentcloud-sdk-live 3.0.388 → 3.0.389

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 884fb9e6ebb61cdb6c9a2dc848e111984c178134
-  data.tar.gz: b7616a1694b6e929069659fbf207ead9825c333a
+  metadata.gz: 7a1451908586fb0ca37fa34014d0ef3b4db979b3
+  data.tar.gz: 83256a9051f81f5842a19b9745e11f9d8ca0311d
 SHA512:
-  metadata.gz: 0c851576824688eb349f2a842a3bbdd65238b42444c9734fe21775dae6ec1d7149f404d254bad96e505b5bb105f4f23d45138dbe38a6648dd7caccfbf418f3cd
-  data.tar.gz: df47f5b2098134a089e4622e26db9ab5acb2b33599588beb37cffcd2298cb441f683e7b2b0de3a58efbdbf63f376a994237c3e8a2c735ed80f768e75c4bf4762
+  metadata.gz: 8e7566dfa35859dc57507c168b374f8cd80eb26dc71267e834b30bf3a5a5b8e8637706c38814a02c719ad6bb77f8aad1c7f4883e917f7fe28af5a8b2eb124611
+  data.tar.gz: e62cd6ac0651a6e92bb86d65af927e3a1197f79ff62f763b70e9a8d6e74912d562c65095e2e33ac6c987a434a8d1b501ab931d568875df27537104e854e6b933

data/lib/VERSION

@@ -1 +1 @@
-3.0.388
+3.0.389

data/lib/v20180801/models.rb

@@ -1099,7 +1099,7 @@ module TencentCloud
         # @param Comment: 任务描述，限制 512 字节。
         # @type Comment: String
         # @param ToUrl: 完整目标 URL 地址。
-        # 用法注意：如果使用该参数来传完整目标地址，则 DomainName, AppName, StreamName 需要传入空值，任务将会使用该 ToUrl 参数指定的目标地址。
+        # 用法注意：如果使用该参数来传完整目标地址，则 DomainName, AppName, StreamName 需要传入空字符串，任务将会使用该 ToUrl 参数指定的目标地址。
 
         # 注意：签名时间需要超过任务结束时间，避免因签名过期造成任务失败。
         # @type ToUrl: String
@@ -1114,10 +1114,16 @@ module TencentCloud
         # @param BackupSourceUrl: 备源 URL。
         # 只允许填一个备源 URL
         # @type BackupSourceUrl: String
+        # @param WatermarkList: 水印信息列表。
+        # 注意：
+        # 1. 最多支持4个不同位置的水印。
+        # 2. 水印图片 URL 请使用合法外网可访问地址。
+        # 3. 支持的水印图片格式：png，jpg，gif 等。
+        # @type WatermarkList: Array
 
-        attr_accessor :SourceType, :SourceUrls, :DomainName, :AppName, :StreamName, :StartTime, :EndTime, :Operator, :PushArgs, :CallbackEvents, :VodLoopTimes, :VodRefreshType, :CallbackUrl, :ExtraCmd, :Comment, :ToUrl, :BackupSourceType, :BackupSourceUrl
+        attr_accessor :SourceType, :SourceUrls, :DomainName, :AppName, :StreamName, :StartTime, :EndTime, :Operator, :PushArgs, :CallbackEvents, :VodLoopTimes, :VodRefreshType, :CallbackUrl, :ExtraCmd, :Comment, :ToUrl, :BackupSourceType, :BackupSourceUrl, :WatermarkList
         
-        def initialize(sourcetype=nil, sourceurls=nil, domainname=nil, appname=nil, streamname=nil, starttime=nil, endtime=nil, operator=nil, pushargs=nil, callbackevents=nil, vodlooptimes=nil, vodrefreshtype=nil, callbackurl=nil, extracmd=nil, comment=nil, tourl=nil, backupsourcetype=nil, backupsourceurl=nil)
+        def initialize(sourcetype=nil, sourceurls=nil, domainname=nil, appname=nil, streamname=nil, starttime=nil, endtime=nil, operator=nil, pushargs=nil, callbackevents=nil, vodlooptimes=nil, vodrefreshtype=nil, callbackurl=nil, extracmd=nil, comment=nil, tourl=nil, backupsourcetype=nil, backupsourceurl=nil, watermarklist=nil)
           @SourceType = sourcetype
           @SourceUrls = sourceurls
           @DomainName = domainname
@@ -1136,6 +1142,7 @@ module TencentCloud
           @ToUrl = tourl
           @BackupSourceType = backupsourcetype
           @BackupSourceUrl = backupsourceurl
+          @WatermarkList = watermarklist
         end
 
         def deserialize(params)
@@ -1157,6 +1164,14 @@ module TencentCloud
           @ToUrl = params['ToUrl']
           @BackupSourceType = params['BackupSourceType']
           @BackupSourceUrl = params['BackupSourceUrl']
+          unless params['WatermarkList'].nil?
+            @WatermarkList = []
+            params['WatermarkList'].each do |i|
+              pullpushwatermarkinfo_tmp = PullPushWatermarkInfo.new
+              pullpushwatermarkinfo_tmp.deserialize(i)
+              @WatermarkList << pullpushwatermarkinfo_tmp
+            end
+          end
         end
       end
 
@@ -7467,10 +7482,20 @@ module TencentCloud
         # @param BackupSourceUrl: 备源 URL。
         # 只允许填一个备源 URL
         # @type BackupSourceUrl: String
+        # @param WatermarkList: 水印信息列表。
+        # 注意：
+        # 1. 最多支持4个不同位置的水印。
+        # 2. 水印图片 URL 请使用合法外网可访问地址。
+        # 3. 支持的水印图片格式：png，jpg等。
+        # 4. 轮播任务修改水印后，轮播到下一个文件时新水印生效。
+        # 5. 直播源任务修改水印后，水印立即生效。
+        # 6. 清除水印时，需携带该水印列表参数，内容为空数组。
+        # 7. 暂不支持动图水印。
+        # @type WatermarkList: Array
 
-        attr_accessor :TaskId, :Operator, :SourceUrls, :StartTime, :EndTime, :VodLoopTimes, :VodRefreshType, :Status, :CallbackEvents, :CallbackUrl, :FileIndex, :OffsetTime, :Comment, :BackupSourceType, :BackupSourceUrl
+        attr_accessor :TaskId, :Operator, :SourceUrls, :StartTime, :EndTime, :VodLoopTimes, :VodRefreshType, :Status, :CallbackEvents, :CallbackUrl, :FileIndex, :OffsetTime, :Comment, :BackupSourceType, :BackupSourceUrl, :WatermarkList
         
-        def initialize(taskid=nil, operator=nil, sourceurls=nil, starttime=nil, endtime=nil, vodlooptimes=nil, vodrefreshtype=nil, status=nil, callbackevents=nil, callbackurl=nil, fileindex=nil, offsettime=nil, comment=nil, backupsourcetype=nil, backupsourceurl=nil)
+        def initialize(taskid=nil, operator=nil, sourceurls=nil, starttime=nil, endtime=nil, vodlooptimes=nil, vodrefreshtype=nil, status=nil, callbackevents=nil, callbackurl=nil, fileindex=nil, offsettime=nil, comment=nil, backupsourcetype=nil, backupsourceurl=nil, watermarklist=nil)
           @TaskId = taskid
           @Operator = operator
           @SourceUrls = sourceurls
@@ -7486,6 +7511,7 @@ module TencentCloud
           @Comment = comment
           @BackupSourceType = backupsourcetype
           @BackupSourceUrl = backupsourceurl
+          @WatermarkList = watermarklist
         end
 
         def deserialize(params)
@@ -7504,6 +7530,14 @@ module TencentCloud
           @Comment = params['Comment']
           @BackupSourceType = params['BackupSourceType']
           @BackupSourceUrl = params['BackupSourceUrl']
+          unless params['WatermarkList'].nil?
+            @WatermarkList = []
+            params['WatermarkList'].each do |i|
+              pullpushwatermarkinfo_tmp = PullPushWatermarkInfo.new
+              pullpushwatermarkinfo_tmp.deserialize(i)
+              @WatermarkList << pullpushwatermarkinfo_tmp
+            end
+          end
         end
       end
 
@@ -8257,6 +8291,48 @@ module TencentCloud
         end
       end
 
+      # 云转推水印信息。
+      class PullPushWatermarkInfo < TencentCloud::Common::AbstractModel
+        # @param PictureUrl: 水印图片 URL。
+        # URL中禁止包含的字符：
+        # ;(){}$>`#"'|
+        # @type PictureUrl: String
+        # @param XPosition: 显示位置，X轴偏移，单位是百分比，默认 0。
+        # @type XPosition: Integer
+        # @param YPosition: 显示位置，Y轴偏移，单位是百分比，默认 0。
+        # @type YPosition: Integer
+        # @param Width: 水印宽度，占直播原始画面宽度百分比，建议高宽只设置一项，另外一项会自适应缩放，避免变形。默认原始宽度。
+        # @type Width: Integer
+        # @param Height: 水印高度，占直播原始画面高度百分比，建议高宽只设置一项，另外一项会自适应缩放，避免变形。默认原始高度。
+        # @type Height: Integer
+        # @param Location: 水印位置，默认 0。
+        # 0：左上角。
+        # 1：右上角。
+        # 2：右下角。
+        # 3：左下角。
+        # @type Location: Integer
+
+        attr_accessor :PictureUrl, :XPosition, :YPosition, :Width, :Height, :Location
+        
+        def initialize(pictureurl=nil, xposition=nil, yposition=nil, width=nil, height=nil, location=nil)
+          @PictureUrl = pictureurl
+          @XPosition = xposition
+          @YPosition = yposition
+          @Width = width
+          @Height = height
+          @Location = location
+        end
+
+        def deserialize(params)
+          @PictureUrl = params['PictureUrl']
+          @XPosition = params['XPosition']
+          @YPosition = params['YPosition']
+          @Width = params['Width']
+          @Height = params['Height']
+          @Location = params['Location']
+        end
+      end
+
       # 拉流配置。
       class PullStreamConfig < TencentCloud::Common::AbstractModel
         # @param ConfigId: 拉流配置 ID。
@@ -8405,10 +8481,21 @@ module TencentCloud
         # @type RecentPullInfo: :class:`Tencentcloud::Live.v20180801.models.RecentPullInfo`
         # @param Comment: 任务备注信息。
         # @type Comment: String
+        # @param BackupSourceType: 备源类型：
+        # PullLivePushLive -直播，
+        # PullVodPushLive -点播。
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type BackupSourceType: String
+        # @param BackupSourceUrl: 备源URL。
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type BackupSourceUrl: String
+        # @param WatermarkList: 水印信息列表。
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type WatermarkList: Array
 
-        attr_accessor :TaskId, :SourceType, :SourceUrls, :DomainName, :AppName, :StreamName, :PushArgs, :StartTime, :EndTime, :Region, :VodLoopTimes, :VodRefreshType, :CreateTime, :UpdateTime, :CreateBy, :UpdateBy, :CallbackUrl, :CallbackEvents, :CallbackInfo, :ErrorInfo, :Status, :RecentPullInfo, :Comment
+        attr_accessor :TaskId, :SourceType, :SourceUrls, :DomainName, :AppName, :StreamName, :PushArgs, :StartTime, :EndTime, :Region, :VodLoopTimes, :VodRefreshType, :CreateTime, :UpdateTime, :CreateBy, :UpdateBy, :CallbackUrl, :CallbackEvents, :CallbackInfo, :ErrorInfo, :Status, :RecentPullInfo, :Comment, :BackupSourceType, :BackupSourceUrl, :WatermarkList
         
-        def initialize(taskid=nil, sourcetype=nil, sourceurls=nil, domainname=nil, appname=nil, streamname=nil, pushargs=nil, starttime=nil, endtime=nil, region=nil, vodlooptimes=nil, vodrefreshtype=nil, createtime=nil, updatetime=nil, createby=nil, updateby=nil, callbackurl=nil, callbackevents=nil, callbackinfo=nil, errorinfo=nil, status=nil, recentpullinfo=nil, comment=nil)
+        def initialize(taskid=nil, sourcetype=nil, sourceurls=nil, domainname=nil, appname=nil, streamname=nil, pushargs=nil, starttime=nil, endtime=nil, region=nil, vodlooptimes=nil, vodrefreshtype=nil, createtime=nil, updatetime=nil, createby=nil, updateby=nil, callbackurl=nil, callbackevents=nil, callbackinfo=nil, errorinfo=nil, status=nil, recentpullinfo=nil, comment=nil, backupsourcetype=nil, backupsourceurl=nil, watermarklist=nil)
           @TaskId = taskid
           @SourceType = sourcetype
           @SourceUrls = sourceurls
@@ -8432,6 +8519,9 @@ module TencentCloud
           @Status = status
           @RecentPullInfo = recentpullinfo
           @Comment = comment
+          @BackupSourceType = backupsourcetype
+          @BackupSourceUrl = backupsourceurl
+          @WatermarkList = watermarklist
         end
 
         def deserialize(params)
@@ -8461,6 +8551,16 @@ module TencentCloud
             @RecentPullInfo.deserialize(params['RecentPullInfo'])
           end
           @Comment = params['Comment']
+          @BackupSourceType = params['BackupSourceType']
+          @BackupSourceUrl = params['BackupSourceUrl']
+          unless params['WatermarkList'].nil?
+            @WatermarkList = []
+            params['WatermarkList'].each do |i|
+              pullpushwatermarkinfo_tmp = PullPushWatermarkInfo.new
+              pullpushwatermarkinfo_tmp.deserialize(i)
+              @WatermarkList << pullpushwatermarkinfo_tmp
+            end
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tencentcloud-sdk-live
 version: !ruby/object:Gem::Version
-  version: 3.0.388
+  version: 3.0.389
 platform: ruby
 authors:
 - Tencent Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tencentcloud-sdk-common