Skip to content

Commit 9cf676b

Browse files
committed
Merge branch 'hotfix_add_param' into 'master' (merge request !43)
添加拼接参数
2 parents f13fa8e + fa34c0b commit 9cf676b

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

ci_media.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,11 @@ type AudioMix struct {
227227

228228
// ConcatFragment TODO
229229
type ConcatFragment struct {
230-
Url string `xml:"Url,omitempty"`
231-
Mode string `xml:"Mode,omitempty"`
232-
StartTime string `xml:"StartTime,omitempty"`
233-
EndTime string `xml:"EndTime,omitempty"`
230+
Url string `xml:"Url,omitempty"`
231+
Mode string `xml:"Mode,omitempty"`
232+
StartTime string `xml:"StartTime,omitempty"`
233+
EndTime string `xml:"EndTime,omitempty"`
234+
FragmentIndex string `xml:"FragmentIndex,omitempty"`
234235
}
235236

236237
// ConcatTemplate TODO

example/CI/media_process/media_process.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,16 @@ func InvokeConcatJob() {
244244
// CreateMediaJobs
245245
concatFragment := make([]cos.ConcatFragment, 0)
246246
concatFragment = append(concatFragment, cos.ConcatFragment{
247-
Url: "https://test-123456789.cos.ap-beijing.myqcloud.com/input/117374C.mp4",
248-
StartTime: "0",
249-
EndTime: "10",
247+
Url: "https://test-123456789.cos.ap-beijing.myqcloud.com/input/117374C.mp4",
248+
StartTime: "0",
249+
EndTime: "10",
250+
FragmentIndex: "0",
250251
})
251252
concatFragment = append(concatFragment, cos.ConcatFragment{
252-
Url: "https://test-123456789.cos.ap-beijing.myqcloud.com/input/117374C.mp4",
253-
StartTime: "20",
254-
EndTime: "30",
253+
Url: "https://test-123456789.cos.ap-beijing.myqcloud.com/input/117374C.mp4",
254+
StartTime: "20",
255+
EndTime: "30",
256+
FragmentIndex: "1",
255257
})
256258
createJobOpt := &cos.CreateMediaJobsOptions{
257259
Tag: "Concat",
@@ -266,10 +268,10 @@ func InvokeConcatJob() {
266268
Format: "mp4",
267269
},
268270
Video: &cos.Video{
269-
Codec: "H.265",
271+
Codec: "H.264",
270272
},
271273
Audio: &cos.Audio{
272-
//Codec: "AAC",
274+
Codec: "AAC",
273275
},
274276
ConcatFragment: concatFragment,
275277
},

0 commit comments

Comments
 (0)