Skip to content

Feature jojoliang 51a2f385 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 9, 2023
Merged

Feature jojoliang 51a2f385 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0737b01
Merge branch 'dev_ecology3' into 'master' (merge request !70)
tencentyuncos Jun 8, 2023
60e34b8
拼接新增转场参数
Jun 9, 2023
8a5ba2a
Merge branch 'dev_concat' into 'master' (merge request !71)
tencentyuncos Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions ci_media.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,20 @@ type ConcatFragment struct {

// ConcatTemplate TODO
type ConcatTemplate struct {
ConcatFragment []ConcatFragment `xml:"ConcatFragment,omitempty"`
Audio *Audio `xml:"Audio,omitempty"`
Video *Video `xml:"Video,omitempty"`
Container *Container `xml:"Container,omitempty"`
Index string `xml:"Index,omitempty"`
AudioMix *AudioMix `xml:"AudioMix,omitempty"`
AudioMixArray []AudioMix `xml:"AudioMixArray,omitempty"`
ConcatFragment []ConcatFragment `xml:"ConcatFragment,omitempty"`
Audio *Audio `xml:"Audio,omitempty"`
Video *Video `xml:"Video,omitempty"`
Container *Container `xml:"Container,omitempty"`
Index string `xml:"Index,omitempty"`
AudioMix *AudioMix `xml:"AudioMix,omitempty"`
AudioMixArray []AudioMix `xml:"AudioMixArray,omitempty"`
SceneChangeInfo *SceneChangeInfo `xml:"SceneChangeInfo,omitempty"`
}

// SceneChangeInfo 转场参数
type SceneChangeInfo struct {
Mode string `xml:"Mode,omitempty"`
Time string `xml:"Time,omitempty"`
}

// SpriteSnapshotConfig TODO
Expand Down
9 changes: 6 additions & 3 deletions service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ type ServiceService service

// ServiceGetResult is the result of Get Service
type ServiceGetResult struct {
XMLName xml.Name `xml:"ListAllMyBucketsResult"`
Owner *Owner `xml:"Owner"`
Buckets []Bucket `xml:"Buckets>Bucket,omitempty"`
XMLName xml.Name `xml:"ListAllMyBucketsResult"`
Owner *Owner `xml:"Owner"`
Buckets []Bucket `xml:"Buckets>Bucket,omitempty"`
Marker string `xml:"Marker"`
NextMarker string `xml:"NextMarker"`
IsTruncated bool `xml:"IsTruncated"`
}

type ServiceGetOptions struct {
Expand Down