Skip to content

Commit b19b335

Browse files
author
wqingzhang
committed
Merge branch 'dev/ci3.0' into 'master' (merge request !22)
dev/ci3.0
2 parents a81420b + 2b1bc46 commit b19b335

File tree

16 files changed

+4529
-189
lines changed

16 files changed

+4529
-189
lines changed

demo/cos_demo.cpp

Lines changed: 695 additions & 10 deletions
Large diffs are not rendered by default.

demo/test_file/douyin-00000.ts

1.56 MB
Binary file not shown.

demo/test_file/douyin.m3u8

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#EXTM3U
2+
#EXT-X-VERSION:3
3+
#EXT-X-TARGETDURATION:5
4+
#EXT-X-MEDIA-SEQUENCE:0
5+
#EXTINF:5.000000,
6+
douyin-00000.ts
7+
#EXT-X-ENDLIST

include/cos_api.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,20 @@ class CosAPI {
883883
// https://cloud.tencent.com/document/product/436/55672
884884
CosResult GetMediaInfo(const GetMediaInfoReq& req, GetMediaInfoResp* resp);
885885

886+
/*** 获取私有 M3U8 ts 资源的下载授权 ***/
887+
// https://cloud.tencent.com/document/product/436/63740
888+
CosResult GetPm3u8(const GetPm3u8Req& req, GetPm3u8Resp* resp);
889+
890+
/*** 查询媒体处理队列 ***/
891+
// https://cloud.tencent.com/document/product/436/54045
892+
CosResult DescribeMediaQueues(const DescribeMediaQueuesReq& req,
893+
DescribeQueuesResp* resp);
894+
895+
/*** 更新媒体处理队列 ***/
896+
// https://cloud.tencent.com/document/product/436/54046
897+
CosResult UpdateMediaQueue(const UpdateMediaQueueReq& req,
898+
UpdateQueueResp* resp);
899+
886900
/* 异步任务接口 */
887901
/** 创建异步任务 **/
888902
CosResult CreateDataProcessJobs(const CreateDataProcessJobsReq& req,
@@ -892,6 +906,10 @@ class CosAPI {
892906
CosResult DescribeDataProcessJob(const DescribeDataProcessJobReq& req,
893907
DescribeDataProcessJobResp* resp);
894908

909+
/** 取消异步任务 **/
910+
CosResult CancelDataProcessJob(const CancelDataProcessJobReq& req,
911+
CancelDataProcessJobResp* resp);
912+
895913
/* 内容审核接口 */
896914

897915
/** 图片审核 **/

include/op/bucket_op.h

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,23 @@ class BucketOp : public BaseOp {
490490
/// \return 本次请求的调用情况(如状态码等)
491491
CosResult GetMediainfo(const GetMediaInfoReq& req, GetMediaInfoResp* resp);
492492

493+
/// \brief 搜索媒体处理队列
494+
/// \brief https://cloud.tencent.com/document/product/436/54045
495+
/// \param req DescribeMediaQueues请求
496+
/// \param resp DescribeMediaQueues返回
497+
///
498+
/// \return 本次请求的调用情况(如状态码等)
499+
CosResult DescribeMediaQueues(const DescribeMediaQueuesReq& req, DescribeQueuesResp* resp);
500+
501+
/// \brief 更新媒体处理队列
502+
/// \brief https://cloud.tencent.com/document/product/436/54046
503+
/// \param req UpdateMediaQueue请求
504+
/// \param resp UpdateMediaQueue返回
505+
///
506+
/// \return 本次请求的调用情况(如状态码等)
507+
CosResult UpdateMediaQueue(const UpdateMediaQueueReq& req,
508+
UpdateQueueResp* resp);
509+
493510
/// \brief 提交数据处理任务
494511
/// \brief https://cloud.tencent.com/document/product/436/83110
495512
/// \param req CreateFileProcessJobs请求
@@ -499,6 +516,15 @@ class BucketOp : public BaseOp {
499516
CosResult CreateDataProcessJobs(const CreateDataProcessJobsReq& req,
500517
CreateDataProcessJobsResp* resp);
501518

519+
/// \brief 取消数据处理任务
520+
/// \brief https://cloud.tencent.com/document/product/436/85082
521+
/// \param req CancelFileProcessJobs请求
522+
/// \param resp CancelFileProcessJobs返回
523+
///
524+
/// \return 本次请求的调用情况(如状态码等)
525+
CosResult CancelDataProcessJob(const CancelDataProcessJobReq& req,
526+
CancelDataProcessJobResp* resp);
527+
502528
/// \brief 提交数据处理任务
503529
/// \param req DescribeDataProcessJobs请求
504530
/// \param resp DescribeDataProcessJobs返回

0 commit comments

Comments
 (0)