update demo

Author: markjrzhang

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.227</version>
+    <version>5.6.229</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>

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

@@ -3,17 +3,8 @@
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.exception.CosClientException;
 import com.qcloud.cos.exception.CosServiceException;
+import com.qcloud.cos.model.*;
 import com.qcloud.cos.model.ciModel.common.ImageProcessRequest;
-import com.qcloud.cos.model.CompleteMultipartUploadRequest;
-import com.qcloud.cos.model.CompleteMultipartUploadResult;
-import com.qcloud.cos.model.InitiateMultipartUploadRequest;
-import com.qcloud.cos.model.InitiateMultipartUploadResult;
-import com.qcloud.cos.model.PartETag;
-import com.qcloud.cos.model.PutObjectRequest;
-import com.qcloud.cos.model.PutObjectResult;
-import com.qcloud.cos.model.UploadPartRequest;
-import com.qcloud.cos.model.UploadPartResult;
-import com.qcloud.cos.model.UploadResult;
 import com.qcloud.cos.model.ciModel.persistence.CIObject;
 import com.qcloud.cos.model.ciModel.persistence.CIUploadResult;
 import com.qcloud.cos.model.ciModel.persistence.PicOperations;
@@ -34,7 +25,7 @@ public class BlindWatermarkDemo {
      * 上传时添加盲水印
      */
     public static void addBlindWatermark(COSClient cosClient) {
-        String bucketName = "markjrzhang-1251704708";
+        String bucketName = "demo-123456789";
         String key = "qrcode.jpg";
         File localFile = new File("demo.jpg");
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
@@ -45,7 +36,7 @@ public static void addBlindWatermark(COSClient cosClient) {
         rule.setBucket(bucketName);
         rule.setFileId("BlindWatermark.jpg");
         // 使用盲水印功能，水印图的宽高不得超过原图的1/8
-        rule.setRule("watermark/3/type/1/image/aHR0cHM6Ly9tYXJranJ6aGFuZy0xMjUxNzA0NzA4LmNvcy5hcC1jaG9uZ3FpbmcubXlxY2xvdWQuY29tL3NodWl5aW4uanBn");
+        rule.setRule("watermark/3/type/3/text/bWFyayB0ZXN0/version/3.0");
 
         ruleList.add(rule);
         picOperations.setRules(ruleList);
@@ -69,7 +60,7 @@ public static void addBlindWatermark(COSClient cosClient) {
      * 上传时获取盲水印
      */
     public static void getBlindWatermark(COSClient cosClient) {
-        String bucketName = "markjrzhang-1251704708";
+        String bucketName = "demo-123456789";
         String key = "qrcode.jpg";
         File localFile = new File("BlindWatermark.jpg");
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
@@ -80,7 +71,7 @@ public static void getBlindWatermark(COSClient cosClient) {
         rule.setBucket(bucketName);
         rule.setFileId("BlindWatermark-test.jpg");
         // 使用盲水印功能，水印图的宽高不得超过原图的1/8
-        rule.setRule("watermark/4/type/2/image/aHR0cHM6Ly9tYXJranJ6aGFuZy0xMjUxNzA0NzA4LmNvcy5hcC1jaG9uZ3FpbmcubXlxY2xvdWQuY29tL3NodWl5aW4uanBn");
+        rule.setRule("watermark/4/type/3/version/3.0");
 
         ruleList.add(rule);
         picOperations.setRules(ruleList);
@@ -149,7 +140,7 @@ public static void extractBlindWatermarkFromExistImage(COSClient cosClient) {
         rule.setBucket(bucketName);
         rule.setFileId("/image/result/extract-shuiyin.jpg");
         // 抽取盲水印
-        rule.setRule("watermark/4/type/2/image/aHR0cDovL2V4YW1wbGVidWNrZXQtMTI1MDAwMDAwMC5jb3MuYXAtZ3Vhbmd6aG91Lm15cWNsb3VkLmNvbS9zaHVpeWluLnBuZw==");
+        rule.setRule("watermark/4/type/3/image/aHR0cDovL2V4YW1wbGVidWNrZXQtMTI1MDAwMDAwMC5jb3MuYXAtZ3Vhbmd6aG91Lm15cWNsb3VkLmNvbS9zaHVpeWluLnBuZw==");
 
         ruleList.add(rule);
         picOperations.setRules(ruleList);

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

@@ -11,6 +11,7 @@
 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.MediaJobOperation;
 import com.qcloud.cos.model.ciModel.job.v2.MediaJobResponseV2;
 import com.qcloud.cos.model.ciModel.job.v2.MediaJobsRequestV2;
 
@@ -26,7 +27,7 @@ public static void main(String[] args) throws Exception {
         // 1 初始化用户身份信息（secretId, secretKey）。
         COSClient client = ClientUtils.getTestClient();
         // 2 调用要使用的方法。
-        createMediaJobs2(client);
+        describeMediaJob(client);
     }
 
     /**
@@ -39,11 +40,11 @@ public static void createMediaJobs(COSClient client) throws UnsupportedEncodingE
         //1.创建任务请求对象
         MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         request.setTag("Transcode");
         request.getInput().setObject("1.mp4");
         request.getOperation().setTemplateId("t0e09a9456d4124542b1f0e44d501*****");
-        request.getOperation().getOutput().setBucket("markjrzhang-1251704708");
+        request.getOperation().getOutput().setBucket("demo-123456789");
         request.getOperation().getOutput().setRegion("ap-chongqing");
         request.getOperation().getOutput().setObject("2.mp4");
         request.setCallBack("https://cloud.tencent.com/xxx");
@@ -63,11 +64,13 @@ public static void createMediaJobs2(COSClient client) throws UnsupportedEncoding
         //1.创建任务请求对象
         MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         request.setTag("Transcode");
-        request.getInput().setObject("1.mp4");
+        request.getInput().setObject("2.mp4");
         //2.1添加媒体任务操作参数
-        MediaTranscodeObject transcode = request.getOperation().getTranscode();
+        MediaJobOperation operation = request.getOperation();
+        operation.setFreeTranscode("true");
+        MediaTranscodeObject transcode = operation.getTranscode();
         MediaContainerObject container = transcode.getContainer();
         container.setFormat("mp4");
         MediaTranscodeVideoObject video = transcode.getVideo();
@@ -95,9 +98,9 @@ public static void createMediaJobs2(COSClient client) throws UnsupportedEncoding
         transConfig.setIsCheckAudioBitrate("false");
         transConfig.setResoAdjMethod("1");
 
-        request.getOperation().getOutput().setBucket("markjrzhang-1251704708");
-        request.getOperation().getOutput().setRegion("ap-chongqing");
-        request.getOperation().getOutput().setObject("demo1.mp4");
+        operation.getOutput().setBucket("demo-123456789");
+        operation.getOutput().setRegion("ap-chongqing");
+        operation.getOutput().setObject("demo1.mp4");
         request.setCallBack("https://cloud.tencent.com/xxx");
         //3.调用接口,获取任务响应对象
         MediaJobResponseV2 response = client.createMediaJobsV2(request);
@@ -113,8 +116,8 @@ public static void describeMediaJob(COSClient client) {
         //1.创建任务请求对象
         MediaJobsRequest request = new MediaJobsRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
-        request.setJobId("jad6542985adf11efb4276de148cbf93a");
+        request.setBucketName("demo-123456789");
+        request.setJobId("j0668d96a5ba111efad510f605e2fde87");
         //3.调用接口,获取任务响应对象
         MediaJobResponse response = client.describeMediaJob(request);
         System.out.println(response.getJobsDetail().getState());
@@ -124,7 +127,7 @@ public static void describeMediaJobs(COSClient client) {
         //1.创建任务请求对象
         MediaJobsRequest request = new MediaJobsRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         request.setTag("Transcode");
         //3.调用接口,获取任务响应对象
         MediaListJobResponse response = client.describeMediaJobs(request);
@@ -138,7 +141,7 @@ public static void cancelMediaJob(COSClient client) {
         //1.创建任务请求对象
         MediaJobsRequest request = new MediaJobsRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         request.setJobId("jbfb0d02a092111ebb3167781d*****");
         //3.调用接口,获取任务响应对象
         Boolean response = client.cancelMediaJob(request);

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

@@ -70,6 +70,12 @@ public class MediaJobOperation {
     @XStreamAlias("EncryptMode")
     private String encryptMode;
 
+    @XStreamAlias("FreeTranscode")
+    private String freeTranscode;
+
+    @XStreamAlias("SnapshotPrefix")
+    private String snapshotPrefix;
+
     @XStreamAlias("Output")
     private MediaOutputObject output;
 
@@ -257,6 +263,14 @@ public SegmentVideoBody getSegmentVideoBody() {
         return segmentVideoBody;
     }
 
+    public String getFreeTranscode() {
+        return freeTranscode;
+    }
+
+    public void setFreeTranscode(String freeTranscode) {
+        this.freeTranscode = freeTranscode;
+    }
+
     public void setSegmentVideoBody(SegmentVideoBody segmentVideoBody) {
         this.segmentVideoBody = segmentVideoBody;
     }
@@ -717,4 +731,12 @@ public SpeechRecognitionResult getSpeechRecognitionResult() {
     public void setSpeechRecognitionResult(SpeechRecognitionResult speechRecognitionResult) {
         this.speechRecognitionResult = speechRecognitionResult;
     }
+
+    public String getSnapshotPrefix() {
+        return snapshotPrefix;
+    }
+
+    public void setSnapshotPrefix(String snapshotPrefix) {
+        this.snapshotPrefix = snapshotPrefix;
+    }
 }

src/main/java/com/qcloud/cos/model/ciModel/job/v2/MediaJobsRequestV2.java

@@ -99,6 +99,7 @@ public class MediaJobsRequestV2 extends CIServiceRequest implements Serializable
     private String callBackType;
     @XStreamAlias("CallBackMqConfig")
     private CallBackMqConfig callBackMqConfig;
+
     @XStreamAlias("QueueType")
     private String queueType;