|
|
@@ -75,14 +75,15 @@ public class VideoFileProcessor {
|
|
|
|
|
|
String audioCodec = mediaProps.getAudioProps().getCodecName();
|
|
|
String videoCodec = mediaProps.getVideoProps().getCodecName();
|
|
|
- VideoUrl videoUrl;
|
|
|
+ VideoUrl videoUrl = null;
|
|
|
if ("aac".equals(audioCodec) && "h264".equals(videoCodec)) {
|
|
|
MediaResolution mediaResolution = MediaQuality.getQuality(width, height);
|
|
|
String urlType = FileType.getVideoUrlType(absolutePath);
|
|
|
String url = objectNameService.getObjectUrl(objectName);
|
|
|
- videoUrl = new VideoUrl(videoFileId, objectName, urlType, url, mediaResolution);
|
|
|
+ videoUrl = new VideoUrl(videoFileId, objectId, urlType, url, mediaResolution);
|
|
|
} else {
|
|
|
- videoUrl = getConvertedVideoUrl(videoFileId, new File(absolutePath), width, height);
|
|
|
+ //videoUrl = getConvertedVideoUrl(videoFileId, new File(absolutePath), width, height);
|
|
|
+ log.error("{} 非 h264&aac 编码, 暂不处理", objectName);
|
|
|
}
|
|
|
|
|
|
if (videoUrl != null) {
|
