Merge branch 'dev-livetrascode-yueliu' into 'master' (merge request !110)

dev-livetrascode-yueliu

Author: tencentyuncos

ci_media.go

@@ -4155,3 +4155,32 @@ func (s *CIService) CreateGeneratePlayListJob(ctx context.Context, opt *CreateGe
 	resp, err := s.client.send(ctx, &sendOpt)
 	return &res, resp, err
 }
+
+// CreateMultiGeneratePlayListJobsOptions TODO
+type CreateMultiGeneratePlayListJobsOptions struct {
+	XMLName             xml.Name                       `xml:"Request"`
+	Tag                 string                         `xml:"Tag,omitempty"`
+	Input               *JobInput                      `xml:"Input,omitempty"`
+	Operation           []GeneratePlayListJobOperation `xml:"Operation,omitempty"`
+	QueueId             string                         `xml:"QueueId,omitempty"`
+	QueueType           string                         `xml:"QueueType,omitempty"`
+	CallBackFormat      string                         `xml:"CallBackFormat,omitempty"`
+	CallBackType        string                         `xml:"CallBackType,omitempty"`
+	CallBack            string                         `xml:"CallBack,omitempty"`
+	CallBackMqConfig    *NotifyConfigCallBackMqConfig  `xml:"CallBackMqConfig,omitempty"`
+	CallBackKafkaConfig *KafkaConfig                   `xml:"CallBackKafkaConfig,omitempty"`
+}
+
+// CreateMultiGeneratePlayListJobs TODO
+func (s *CIService) CreateMultiGeneratePlayListJobs(ctx context.Context, opt *CreateMultiGeneratePlayListJobsOptions) (*CreateMultiMediaJobsResult, *Response, error) {
+	var res CreateMultiMediaJobsResult
+	sendOpt := sendOptions{
+		baseURL: s.client.BaseURL.CIURL,
+		uri:     "/jobs",
+		method:  http.MethodPost,
+		body:    opt,
+		result:  &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return &res, resp, err
+}

ci_media_test.go

@@ -3646,3 +3646,85 @@ func TestCIService_CreateGeneratePlayListJob(t *testing.T) {
 		t.Fatalf("CI.CreateGeneratePlayListJob returned error: %v", err)
 	}
 }
+
+func TestCIService_CreateMultiGeneratePlayListJobs(t *testing.T) {
+	setup()
+	defer teardown()
+
+	mux.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, http.MethodPost)
+		testHeader(t, r, "Content-Type", "application/xml")
+	})
+
+	opt := &CreateMultiGeneratePlayListJobsOptions{
+		Input: &JobInput{
+			Object: "test.mp4",
+		},
+		Operation: []GeneratePlayListJobOperation{
+			{
+				Tag: "GeneratePlayList",
+				Output: &JobOutput{
+					Region: "ap-beijing",
+					Bucket: "abc-1250000000",
+					Object: "live/a.m3u8",
+				},
+				Transcode: &LiveTanscode{
+					Video: &LiveTanscodeVideo{
+						Codec:   "H.264",
+						Width:   "960", // 设置480、720、960、1080
+						Bitrate: "2000",
+						Maxrate: "5000",
+						Fps:     "30",
+					},
+					Container: &Container{
+						Format: "hls",
+						ClipConfig: &ClipConfig{
+							Duration: "5",
+						},
+					},
+					TransConfig: &LiveTanscodeTransConfig{
+						HlsEncrypt: &HlsEncrypt{
+							IsHlsEncrypt: true,
+						},
+						InitialClipNum: "2",
+						CosTag:         "a=a&b=b",
+					},
+				},
+			},
+			{
+				Tag: "GeneratePlayList",
+				Output: &JobOutput{
+					Region: "ap-beijing",
+					Bucket: "abc-1250000000",
+					Object: "live/b.m3u8",
+				},
+				Transcode: &LiveTanscode{
+					Video: &LiveTanscodeVideo{
+						Codec:   "H.264",
+						Width:   "1080", // 设置480、720、960、1080
+						Bitrate: "2000",
+						Maxrate: "5000",
+						Fps:     "30",
+					},
+					Container: &Container{
+						Format: "hls",
+						ClipConfig: &ClipConfig{
+							Duration: "5",
+						},
+					},
+					TransConfig: &LiveTanscodeTransConfig{
+						InitialClipNum: "2",
+						CosTag:         "a=a&b=b",
+					},
+				},
+			},
+		},
+		QueueId:  "p893bcda225bf4945a378da6662e81a89",
+		CallBack: "https://www.callback.com",
+	}
+
+	_, _, err := client.CI.CreateMultiGeneratePlayListJobs(context.Background(), opt)
+	if err != nil {
+		t.Fatalf("CI.CreateMultiGeneratePlayListJobs returned errors: %v", err)
+	}
+}

example/CI/workflow_and_job/jobs.go

@@ -1111,6 +1111,82 @@ func JobNotifyCallback() {
 	}
 }
 
+func InvokeMultiGeneratePlayListJobs() {
+	c := getClient()
+	createJobOpt := &cos.CreateMultiGeneratePlayListJobsOptions{
+		Tag: "GeneratePlayList",
+		Input: &cos.JobInput{
+			Object: "speed.mp4",
+		},
+		Operation: []cos.GeneratePlayListJobOperation{
+			{
+				Tag: "GeneratePlayList",
+				Output: &cos.JobOutput{
+					Region: "ap-beijing",
+					Bucket: "test-1234567890",
+					Object: "live/a.m3u8",
+				},
+				Transcode: &cos.LiveTanscode{
+					Video: &cos.LiveTanscodeVideo{
+						Codec:   "H.264",
+						Width:   "1280", // 设置480、720、960、1080
+						Bitrate: "293",
+						Maxrate: "5000",
+						Fps:     "25",
+					},
+					Container: &cos.Container{
+						Format: "hls",
+						ClipConfig: &cos.ClipConfig{
+							Duration: "3",
+						},
+					},
+					TransConfig: &cos.LiveTanscodeTransConfig{
+						// HlsEncrypt: &cos.HlsEncrypt{
+						// 	IsHlsEncrypt: true,
+						// },
+						InitialClipNum: "10",
+						CosTag:         "a=a&b=b",
+					},
+				},
+			},
+			{
+				Tag: "GeneratePlayList",
+				Output: &cos.JobOutput{
+					Region: "ap-beijing",
+					Bucket: "test-1234567890",
+					Object: "live/b.m3u8",
+				},
+				Transcode: &cos.LiveTanscode{
+					Video: &cos.LiveTanscodeVideo{
+						Codec:   "H.264",
+						Width:   "1280", // 设置480、720、960、1080
+						Bitrate: "293",
+						Maxrate: "5000",
+						Fps:     "25",
+					},
+					Container: &cos.Container{
+						Format: "hls",
+						ClipConfig: &cos.ClipConfig{
+							Duration: "3",
+						},
+					},
+					TransConfig: &cos.LiveTanscodeTransConfig{
+						// HlsEncrypt: &cos.HlsEncrypt{
+						// 	IsHlsEncrypt: true,
+						// },
+						InitialClipNum: "10",
+						CosTag:         "a=a&b=b",
+					},
+				},
+			},
+		},
+	}
+	createJobRes, _, err := c.CI.CreateMultiGeneratePlayListJobs(context.Background(), createJobOpt)
+	log_status(err)
+	fmt.Printf("%+v\n", createJobRes.JobsDetail)
+}
+
 func main() {
-	InvokeTranscodeJob()
+	// InvokeTranscodeJob()
+	InvokeMultiGeneratePlayListJobs()
 }