Commit ae0990148d56e761513c0d3814549d824a285263

Authored by 王言钊
2 parents 9303164d 51c0b951

Merge branch 'test' into dev

src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
@@ -179,8 +179,8 @@ public class VideosControllerApi { @@ -179,8 +179,8 @@ public class VideosControllerApi {
179 } 179 }
180 //如果审核类型是机审 180 //如果审核类型是机审
181 } else if (shyVideos1.getShenhe_type() == CommonConst.AUDIT_TYPE_MACHANE) { 181 } else if (shyVideos1.getShenhe_type() == CommonConst.AUDIT_TYPE_MACHANE) {
182 - //"目击者"视频,小于60秒的抽帧  
183 - if (CommonUtils.isNotNull(duration) && duration < 60) { 182 + //"目击者"视频,小于300秒的抽帧
  183 + if (CommonUtils.isNotNull(duration) && duration < 300) {
184 shyVideos1 = avsample(shyVideos1); 184 shyVideos1 = avsample(shyVideos1);
185 } else { 185 } else {
186 //机审超过60秒的改为人工审核 186 //机审超过60秒的改为人工审核