Skip to content

Commit c475655

Browse files
lyu571lyu571
authored
Merge pull request #2163 from tencentcloudstack/feat/support-mps-feature
feat:support mps withdraw wm operation
2 parents ca7d23f + 36d1566 commit c475655

15 files changed

+6761
-2458
lines changed

‎.changelog/2163.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_mps_withdraws_watermark_operation
3+
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ require (
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.672
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.651
6666
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.734
67-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584
67+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.758
6868
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540
6969
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.676
7070
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.751

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.734 h1:VJl
914914
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.734/go.mod h1:H2gtCj02D5k7h0JttS9RMoRgkJ8m9qia/9RlMjbvT0o=
915915
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584 h1:FJxYOAolkBhXjQMWoiTek9Ag0bslcKFHyrM7w2Jsxos=
916916
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584/go.mod h1:CY/hEcXbaOZBU9Qm/MMIctafi8FFJaMIGTlGUjnymW0=
917+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.758 h1:lsuwM6CNu1aKpHOmsA7dizDxd4gCOBNvT25+yQNPGx8=
918+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.758/go.mod h1:OklPo0yw4wKOYDAtXgmtUJCzGdvYooaqKchviSg84Ro=
917919
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540 h1:gUVuwcjt9baj+/5LFafjdR53/xSdQxfA45Vp6E65rXU=
918920
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540/go.mod h1:jHcHwlsdNL9ycLwNtqYZVjLKJILA1xuODMeMDMOxCrA=
919921
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.676 h1:KDt87M2b8j/Xo/9o+kaVtJ46fOtPctCpMDa1CJpSlkY=

‎tencentcloud/provider.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,6 +1567,7 @@ Media Processing Service(MPS)
15671567
tencentcloud_mps_ai_analysis_template
15681568
tencentcloud_mps_adaptive_dynamic_streaming_template
15691569
tencentcloud_mps_person_sample
1570+
tencentcloud_mps_withdraws_watermark_operation
15701571
15711572
Cloud HDFS(CHDFS)
15721573
Data Source
@@ -3029,6 +3030,7 @@ func Provider() *schema.Provider {
30293030
"tencentcloud_mps_ai_analysis_template": resourceTencentCloudMpsAiAnalysisTemplate(),
30303031
"tencentcloud_mps_adaptive_dynamic_streaming_template": resourceTencentCloudMpsAdaptiveDynamicStreamingTemplate(),
30313032
"tencentcloud_mps_person_sample": resourceTencentCloudMpsPersonSample(),
3033+
"tencentcloud_mps_withdraws_watermark_operation": resourceTencentCloudMpsWithdrawsWatermarkOperation(),
30323034
"tencentcloud_cbs_disk_backup": resourceTencentCloudCbsDiskBackup(),
30333035
"tencentcloud_cbs_snapshot_share_permission": resourceTencentCloudCbsSnapshotSharePermission(),
30343036
"tencentcloud_cbs_disk_backup_rollback_operation": resourceTencentCloudCbsDiskBackupRollbackOperation(),

‎tencentcloud/resource_tc_mps_adaptive_dynamic_streaming_template.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateCreate(d *schema.Res
254254
videoTemplateInfo.Codec = helper.String(v.(string))
255255
}
256256
if v, ok := videoMap["fps"]; ok {
257-
videoTemplateInfo.Fps = helper.IntUint64(v.(int))
257+
videoTemplateInfo.Fps = helper.IntInt64(v.(int))
258258
}
259259
if v, ok := videoMap["bitrate"]; ok {
260-
videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
260+
videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
261261
}
262262
if v, ok := videoMap["resolution_adaptive"]; ok {
263263
videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -285,7 +285,7 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateCreate(d *schema.Res
285285
audioTemplateInfo.Codec = helper.String(v.(string))
286286
}
287287
if v, ok := audioMap["bitrate"]; ok {
288-
audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
288+
audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
289289
}
290290
if v, ok := audioMap["sample_rate"]; ok {
291291
audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))
@@ -511,10 +511,10 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateUpdate(d *schema.Res
511511
videoTemplateInfo.Codec = helper.String(v.(string))
512512
}
513513
if v, ok := videoMap["fps"]; ok {
514-
videoTemplateInfo.Fps = helper.IntUint64(v.(int))
514+
videoTemplateInfo.Fps = helper.IntInt64(v.(int))
515515
}
516516
if v, ok := videoMap["bitrate"]; ok {
517-
videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
517+
videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
518518
}
519519
if v, ok := videoMap["resolution_adaptive"]; ok {
520520
videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -542,7 +542,7 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateUpdate(d *schema.Res
542542
audioTemplateInfo.Codec = helper.String(v.(string))
543543
}
544544
if v, ok := audioMap["bitrate"]; ok {
545-
audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
545+
audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
546546
}
547547
if v, ok := audioMap["sample_rate"]; ok {
548548
audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))

‎tencentcloud/resource_tc_mps_transcode_template.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,10 @@ func resourceTencentCloudMpsTranscodeTemplateCreate(d *schema.ResourceData, meta
485485
videoTemplateInfo.Codec = helper.String(v.(string))
486486
}
487487
if v, ok := dMap["fps"]; ok {
488-
videoTemplateInfo.Fps = helper.IntUint64(v.(int))
488+
videoTemplateInfo.Fps = helper.IntInt64(v.(int))
489489
}
490490
if v, ok := dMap["bitrate"]; ok {
491-
videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
491+
videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
492492
}
493493
if v, ok := dMap["resolution_adaptive"]; ok {
494494
videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -517,7 +517,7 @@ func resourceTencentCloudMpsTranscodeTemplateCreate(d *schema.ResourceData, meta
517517
audioTemplateInfo.Codec = helper.String(v.(string))
518518
}
519519
if v, ok := dMap["bitrate"]; ok {
520-
audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
520+
audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
521521
}
522522
if v, ok := dMap["sample_rate"]; ok {
523523
audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))
@@ -534,7 +534,7 @@ func resourceTencentCloudMpsTranscodeTemplateCreate(d *schema.ResourceData, meta
534534
tEHDConfig.Type = helper.String(v.(string))
535535
}
536536
if v, ok := dMap["max_video_bitrate"]; ok {
537-
tEHDConfig.MaxVideoBitrate = helper.IntUint64(v.(int))
537+
tEHDConfig.MaxVideoBitrate = helper.IntInt64(v.(int))
538538
}
539539
request.TEHDConfig = &tEHDConfig
540540
}
@@ -1025,10 +1025,10 @@ func resourceTencentCloudMpsTranscodeTemplateUpdate(d *schema.ResourceData, meta
10251025
videoTemplateInfo.Codec = helper.String(v.(string))
10261026
}
10271027
if v, ok := dMap["fps"]; ok {
1028-
videoTemplateInfo.Fps = helper.IntUint64(v.(int))
1028+
videoTemplateInfo.Fps = helper.IntInt64(v.(int))
10291029
}
10301030
if v, ok := dMap["bitrate"]; ok {
1031-
videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
1031+
videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
10321032
}
10331033
if v, ok := dMap["resolution_adaptive"]; ok {
10341034
videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -1059,7 +1059,7 @@ func resourceTencentCloudMpsTranscodeTemplateUpdate(d *schema.ResourceData, meta
10591059
audioTemplateInfo.Codec = helper.String(v.(string))
10601060
}
10611061
if v, ok := dMap["bitrate"]; ok {
1062-
audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
1062+
audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
10631063
}
10641064
if v, ok := dMap["sample_rate"]; ok {
10651065
audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))
@@ -1078,7 +1078,7 @@ func resourceTencentCloudMpsTranscodeTemplateUpdate(d *schema.ResourceData, meta
10781078
tEHDConfig.Type = helper.String(v.(string))
10791079
}
10801080
if v, ok := dMap["max_video_bitrate"]; ok {
1081-
tEHDConfig.MaxVideoBitrate = helper.IntUint64(v.(int))
1081+
tEHDConfig.MaxVideoBitrate = helper.IntInt64(v.(int))
10821082
}
10831083
request.TEHDConfig = &tEHDConfig
10841084
}

0 commit comments

Comments
 (0)