update MediaJob API

Author: markjrzhang

src/main/java/com/qcloud/cos/demo/ci/BlindWatermarkDemo.java

@@ -27,25 +27,25 @@
 import java.util.List;
 
 /**
- * 盲水印相关demo API 接口说明：https://cloud.tencent.com/document/product/460/19017
+ * 盲水印相关demo API 接口说明：https://cloud.tencent.com/document/product/436/46782
  */
 public class BlindWatermarkDemo {
+    /**
+     * 上传时添加盲水印
+     */
     public static void addBlindWatermark(COSClient cosClient) {
-        // bucket名需包含appid
-        // api 请参考：https://cloud.tencent.com/document/product/436/46782
-        String bucketName = "examplebucket-1250000000";
-
-        String key = "qrcode.png";
-        File localFile = new File("E://qrcode.png");
+        String bucketName = "markjrzhang-1251704708";
+        String key = "qrcode.jpg";
+        File localFile = new File("demo.jpg");
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
         PicOperations picOperations = new PicOperations();
         picOperations.setIsPicInfo(1);
         List<PicOperations.Rule> ruleList = new LinkedList<>();
         PicOperations.Rule rule = new PicOperations.Rule();
         rule.setBucket(bucketName);
-        rule.setFileId("qrcode-watermark.png");
+        rule.setFileId("BlindWatermark.jpg");
         // 使用盲水印功能，水印图的宽高不得超过原图的1/8
-        rule.setRule("watermark/3/type/2/image/aHR0cDovL2V4YW1wbGVidWNrZXQtMTI1MDAwMDAwMC5jb3MuYXAtZ3Vhbmd6aG91Lm15cWNsb3VkLmNvbS9zaHVpeWluLnBuZw==");
+        rule.setRule("watermark/3/type/1/image/aHR0cHM6Ly9tYXJranJ6aGFuZy0xMjUxNzA0NzA4LmNvcy5hcC1jaG9uZ3FpbmcubXlxY2xvdWQuY29tL3NodWl5aW4uanBn");
 
         ruleList.add(rule);
         picOperations.setRules(ruleList);
@@ -65,100 +65,23 @@ public static void addBlindWatermark(COSClient cosClient) {
         }
     }
 
-    public static void addBlindWatermarkWithTransferManager(TransferManager transferManager) throws InterruptedException {
-        // bucket名需包含appid
-        // api 请参考：https://cloud.tencent.com/document/product/436/46782
-        String bucketName = "examplebucket-1250000000";
-        String key = "qrcode.png";
-        File localFile = new File("E://qrcode.png");
-        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
-        PicOperations picOperations = new PicOperations();
-        picOperations.setIsPicInfo(1);
-        List<PicOperations.Rule> ruleList = new LinkedList<>();
-        PicOperations.Rule rule1 = new PicOperations.Rule();
-        rule1.setBucket(bucketName);
-        rule1.setFileId("qrcode-watermark.png");
-        rule1.setRule("watermark/3/type/3/text/dGVuY2VudCBjbG91ZA==");
-        ruleList.add(rule1);
-        picOperations.setRules(ruleList);
-        putObjectRequest.setPicOperations(picOperations);
-
-        Upload upload = transferManager.upload(putObjectRequest);
-        UploadResult uploadResult = upload.waitForUploadResult();
-        CIUploadResult ciUploadResult = uploadResult.getCiUploadResult();
-        System.out.println(uploadResult.getRequestId());
-        System.out.println(ciUploadResult.getOriginalInfo().getEtag());
-        for(CIObject ciObject:ciUploadResult.getProcessResults().getObjectList()) {
-            System.out.println(ciObject.getLocation());
-        }
-    }
-
-    public static void addBlindWatermarkWithMultipart(COSClient cosClient) throws FileNotFoundException {
-        // bucket名需包含appid
-        // api 请参考：https://cloud.tencent.com/document/product/436/46782
-        String bucketName = "examplebucket-1250000000";
-
-        String key = "qrcode.png";
-        File localFile = new File("E://qrcode.png");
-        InitiateMultipartUploadRequest request = new InitiateMultipartUploadRequest(bucketName, key);
-        InitiateMultipartUploadResult initResult = cosClient.initiateMultipartUpload(request);
-        String uploadId = initResult.getUploadId();
-
-        // 上传分块
-        List<PartETag> partETags = new LinkedList<>();
-        UploadPartRequest uploadPartRequest = new UploadPartRequest();
-        uploadPartRequest.setBucketName(bucketName);
-        uploadPartRequest.setKey(key);
-        uploadPartRequest.setUploadId(uploadId);
-        // 设置分块的数据来源输入流
-        uploadPartRequest.setInputStream(new FileInputStream(localFile));
-        // 设置分块的长度
-        uploadPartRequest.setPartSize(localFile.length()); // 设置数据长度
-        uploadPartRequest.setPartNumber(1);     // 假设要上传的part编号是10
-        UploadPartResult uploadPartResult = cosClient.uploadPart(uploadPartRequest);
-        PartETag partETag = uploadPartResult.getPartETag();
-        partETags.add(partETag);
-
-        // 合并分块并带上图像处理参数
-        CompleteMultipartUploadRequest completeMultipartUploadRequest =
-                new CompleteMultipartUploadRequest(bucketName, key, uploadId, partETags);
-        PicOperations picOperations = new PicOperations();
-        picOperations.setIsPicInfo(1);
-        List<PicOperations.Rule> ruleList = new LinkedList<>();
-        PicOperations.Rule rule1 = new PicOperations.Rule();
-        rule1.setBucket(bucketName);
-        rule1.setFileId("qrcode-watermark.png");
-        rule1.setRule("watermark/3/type/3/text/dGVuY2VudCBjbG91ZA==");
-        ruleList.add(rule1);
-        picOperations.setRules(ruleList);
-        completeMultipartUploadRequest.setPicOperations(picOperations);
-
-        CompleteMultipartUploadResult completeMultipartUploadResult =
-                    cosClient.completeMultipartUpload(completeMultipartUploadRequest);
-
-        CIUploadResult ciUploadResult = completeMultipartUploadResult.getCiUploadResult();
-        System.out.println(completeMultipartUploadResult.getRequestId());
-        System.out.println(ciUploadResult.getOriginalInfo().getEtag());
-        for(CIObject ciObject:ciUploadResult.getProcessResults().getObjectList()) {
-            System.out.println(ciObject.getLocation());
-        }
-    }
-
-    public static void extractBlindWatermark(COSClient cosClient) {
-        // bucket名需包含appid
-        // api 请参考：https://cloud.tencent.com/document/product/436/46782
-        String bucketName = "examplebucket-1250000000";
-
-        String key = "qrcode-watermark.png";
-        File localFile = new File("E://qrcode-watermark.png");
+    /**
+     * 上传时获取盲水印
+     */
+    public static void getBlindWatermark(COSClient cosClient) {
+        String bucketName = "markjrzhang-1251704708";
+        String key = "qrcode.jpg";
+        File localFile = new File("BlindWatermark.jpg");
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
         PicOperations picOperations = new PicOperations();
         picOperations.setIsPicInfo(1);
         List<PicOperations.Rule> ruleList = new LinkedList<>();
         PicOperations.Rule rule = new PicOperations.Rule();
         rule.setBucket(bucketName);
-        rule.setFileId("qrcode-watermark-extract.png");
-        rule.setRule("watermark/4/type/2/image/aHR0cDovL2V4YW1wbGVidWNrZXQtMTI1MDAwMDAwMC5jb3MuYXAtZ3Vhbmd6aG91Lm15cWNsb3VkLmNvbS9zaHVpeWluLnBuZw==");
+        rule.setFileId("BlindWatermark-test.jpg");
+        // 使用盲水印功能，水印图的宽高不得超过原图的1/8
+        rule.setRule("watermark/4/type/2/image/aHR0cHM6Ly9tYXJranJ6aGFuZy0xMjUxNzA0NzA4LmNvcy5hcC1jaG9uZ3FpbmcubXlxY2xvdWQuY29tL3NodWl5aW4uanBn");
+
         ruleList.add(rule);
         picOperations.setRules(ruleList);
         putObjectRequest.setPicOperations(picOperations);
@@ -169,7 +92,6 @@ public static void extractBlindWatermark(COSClient cosClient) {
             System.out.println(ciUploadResult.getOriginalInfo().getEtag());
             for(CIObject ciObject:ciUploadResult.getProcessResults().getObjectList()) {
                 System.out.println(ciObject.getLocation());
-                System.out.println(ciObject.getWatermarkStatus());
             }
         } catch (CosServiceException e) {
             e.printStackTrace();
@@ -192,7 +114,7 @@ public static void addBlindWatermarkToExistImage(COSClient cosClient) {
         rule.setBucket(bucketName);
         rule.setFileId("/image/result/dog.jpg");
         // 使用盲水印功能，水印图的宽高不得超过原图的1/8
-        rule.setRule("watermark/3/type/2/image/aHR0cDovL2V4YW1wbGVidWNrZXQtMTI1MDAwMDAwMC5jb3MuYXAtZ3Vhbmd6aG91Lm15cWNsb3VkLmNvbS9zaHVpeWluLnBuZw==");
+        rule.setRule("watermark/3/type/2/image/aHR0cHM6Ly9tYXJranJ6aGFuZy0xMjUxNzA0NzA4LmNvcy5hcC1jaG9uZ3FpbmcubXlxY2xvdWQuY29tL3NodWl5aW4uanBn");
 
         ruleList.add(rule);
         picOperations.setRules(ruleList);
@@ -210,6 +132,9 @@ public static void addBlindWatermarkToExistImage(COSClient cosClient) {
         }
     }
 
+    /**
+     * 云上数据处理
+     */
     public static void extractBlindWatermarkFromExistImage(COSClient cosClient) {
         // bucket名需包含appid
         // api 请参考：https://cloud.tencent.com/document/product/436/46782
@@ -244,10 +169,7 @@ public static void extractBlindWatermarkFromExistImage(COSClient cosClient) {
 
     public static void main(String[] args) throws Exception {
         COSClient cosClient = ClientUtils.getTestClient();
-//        addBlindWatermark(cosClient);
-//        extractBlindWatermark(cosClient);
-        addBlindWatermarkToExistImage(cosClient);
-        extractBlindWatermarkFromExistImage(cosClient);
+        getBlindWatermark(cosClient);
         cosClient.shutdown();
     }
 }

src/main/java/com/qcloud/cos/demo/ci/JobDemo.java

@@ -4,14 +4,15 @@
 import com.qcloud.cos.model.ciModel.job.MediaAudioObject;
 import com.qcloud.cos.model.ciModel.job.MediaContainerObject;
 import com.qcloud.cos.model.ciModel.job.MediaJobObject;
-import com.qcloud.cos.model.ciModel.job.MediaJobOperation;
 import com.qcloud.cos.model.ciModel.job.MediaJobResponse;
 import com.qcloud.cos.model.ciModel.job.MediaJobsRequest;
 import com.qcloud.cos.model.ciModel.job.MediaListJobResponse;
 import com.qcloud.cos.model.ciModel.job.MediaTimeIntervalObject;
 import com.qcloud.cos.model.ciModel.job.MediaTransConfigObject;
 import com.qcloud.cos.model.ciModel.job.MediaTranscodeObject;
 import com.qcloud.cos.model.ciModel.job.MediaTranscodeVideoObject;
+import com.qcloud.cos.model.ciModel.job.v2.MediaJobResponseV2;
+import com.qcloud.cos.model.ciModel.job.v2.MediaJobsRequestV2;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;
@@ -25,7 +26,7 @@ public static void main(String[] args) throws Exception {
         // 1 初始化用户身份信息（secretId, secretKey）。
         COSClient client = ClientUtils.getTestClient();
         // 2 调用要使用的方法。
-        createMediaJobs(client);
+        createMediaJobs2(client);
     }
 
     /**
@@ -36,19 +37,19 @@ public static void main(String[] args) throws Exception {
      */
     public static void createMediaJobs(COSClient client) throws UnsupportedEncodingException {
         //1.创建任务请求对象
-        MediaJobsRequest request = new MediaJobsRequest();
+        MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("DemoBucket-123456789");
+        request.setBucketName("markjrzhang-1251704708");
         request.setTag("Transcode");
         request.getInput().setObject("1.mp4");
         request.getOperation().setTemplateId("t0e09a9456d4124542b1f0e44d501*****");
-        request.getOperation().getOutput().setBucket("DemoBucket-123456789");
+        request.getOperation().getOutput().setBucket("markjrzhang-1251704708");
         request.getOperation().getOutput().setRegion("ap-chongqing");
         request.getOperation().getOutput().setObject("2.mp4");
         request.setCallBack("https://cloud.tencent.com/xxx");
 //        request.setCallBackFormat("json");
         //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.createMediaJobs(request);
+        MediaJobResponseV2 response = client.createMediaJobsV2(request);
         System.out.println(response);
     }
 
@@ -60,14 +61,13 @@ public static void createMediaJobs(COSClient client) throws UnsupportedEncodingE
      */
     public static void createMediaJobs2(COSClient client) throws UnsupportedEncodingException {
         //1.创建任务请求对象
-        MediaJobsRequest request = new MediaJobsRequest();
+        MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("DemoBucket-123456789");
+        request.setBucketName("markjrzhang-1251704708");
         request.setTag("Transcode");
         request.getInput().setObject("1.mp4");
         //2.1添加媒体任务操作参数
         MediaTranscodeObject transcode = request.getOperation().getTranscode();
-        MediaJobOperation operation = request.getOperation();
         MediaContainerObject container = transcode.getContainer();
         container.setFormat("mp4");
         MediaTranscodeVideoObject video = transcode.getVideo();
@@ -91,17 +91,17 @@ public static void createMediaJobs2(COSClient client) throws UnsupportedEncoding
         timeInterval.setDuration("60");
 
         MediaTransConfigObject transConfig = transcode.getTransConfig();
-//        transConfig.setAdjDarMethod("scale");
-//        transConfig.setIsCheckAudioBitrate("false");
-//        transConfig.setResoAdjMethod("1");
+        transConfig.setAdjDarMethod("scale");
+        transConfig.setIsCheckAudioBitrate("false");
+        transConfig.setResoAdjMethod("1");
 
-        request.getOperation().getOutput().setBucket("DemoBucket-123456789");
+        request.getOperation().getOutput().setBucket("markjrzhang-1251704708");
         request.getOperation().getOutput().setRegion("ap-chongqing");
         request.getOperation().getOutput().setObject("demo1.mp4");
         request.setCallBack("https://cloud.tencent.com/xxx");
         //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.createMediaJobs(request);
-        System.out.println(response.getJobsDetail().getOperation().getTranscode());
+        MediaJobResponseV2 response = client.createMediaJobsV2(request);
+        System.out.println(response.getJobsDetail().getJobId());
     }
 
     /**
@@ -113,23 +113,18 @@ public static void describeMediaJob(COSClient client) {
         //1.创建任务请求对象
         MediaJobsRequest request = new MediaJobsRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("DemoBucket-123456789");
-        request.setJobId("j2b27107ee3ad11ebbf6d73cb5317****");
+        request.setBucketName("markjrzhang-1251704708");
+        request.setJobId("jad6542985adf11efb4276de148cbf93a");
         //3.调用接口,获取任务响应对象
         MediaJobResponse response = client.describeMediaJob(request);
-        System.out.println(response.getJobsDetail().getOperation().getTranscode());
+        System.out.println(response.getJobsDetail().getState());
     }
 
-    /**
-     * describeMediaJobs 查询任务列表
-     *
-     * @param client
-     */
     public static void describeMediaJobs(COSClient client) {
         //1.创建任务请求对象
         MediaJobsRequest request = new MediaJobsRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("DemoBucket-123456789");
+        request.setBucketName("markjrzhang-1251704708");
         request.setTag("Transcode");
         //3.调用接口,获取任务响应对象
         MediaListJobResponse response = client.describeMediaJobs(request);
@@ -139,16 +134,11 @@ public static void describeMediaJobs(COSClient client) {
         }
     }
 
-    /**
-     * cancelMediaJob 取消任务
-     *
-     * @param client
-     */
     public static void cancelMediaJob(COSClient client) {
         //1.创建任务请求对象
         MediaJobsRequest request = new MediaJobsRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("DemoBucket-123456789");
+        request.setBucketName("markjrzhang-1251704708");
         request.setJobId("jbfb0d02a092111ebb3167781d*****");
         //3.调用接口,获取任务响应对象
         Boolean response = client.cancelMediaJob(request);

src/main/java/com/qcloud/cos/model/ciModel/job/MediaContainerObject.java

@@ -14,7 +14,7 @@ public class MediaContainerObject {
      * 分片配置,当format为hls和dash时有效
      */
     @XStreamAlias("ClipConfig")
-    private MediaClipConfig clipConfig = new MediaClipConfig();
+    private MediaClipConfig clipConfig ;
 
     public String getFormat() {
         return format;

src/main/java/com/qcloud/cos/model/ciModel/job/MediaJobOperation.java

@@ -52,6 +52,9 @@ public class MediaJobOperation {
     @XStreamAlias("SnapshotPrefix")
     private String snapshotPrefix;
 
+    @XStreamAlias("FreeTranscode")
+    private String freeTranscode;
+
     @XStreamAlias("Output")
     private MediaOutputObject output;
 
@@ -521,6 +524,14 @@ public void setVersion(String version) {
         this.version = version;
     }
 
+    public String getFreeTranscode() {
+        return freeTranscode;
+    }
+
+    public void setFreeTranscode(String freeTranscode) {
+        this.freeTranscode = freeTranscode;
+    }
+
     public String getSnapshotPrefix() {
         return snapshotPrefix;
     }