inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATS-812: PoC FFmpeg (experimental)

Browse Source 
- remove extra isTransformable check (& related isSupported src/tgt) for now
- add mov to mp4 to supported src/tgt config
- update lic headers to 2022
This commit is contained in:
Jan Vonka
2022-01-06 14:40:54 +00:00
parent d1f38d30a1
commit dba34000b9
9 changed files with 23 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/src/main/java/org/alfresco/transformer/Application.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@@ -44,6 +44,9 @@ import java.util.Arrays;
import static org.alfresco.transformer.logging.StandardMessages.LICENCE;
/**
* @author janv
*/
@SpringBootApplication
@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
public class Application

77
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/src/main/java/org/alfresco/transformer/FFmpegController.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@@ -39,7 +39,7 @@ import java.util.Collections;
import java.util.Map;
/**
* Controller for the Docker based FFmpeg transformer.
* Controller for the FFmpeg transformer.
*
* Status Codes:
*
@@ -57,6 +57,8 @@ import java.util.Map;
* 500 Internal Server Error: Transformer failed to create an output file (the exit code was 0, so there should be some content)
* 500 Internal Server Error: Filename encoding error
* 507 Insufficient Storage: Failed to store the source file
*
* @author janv
*/
@Controller
public class FFmpegController extends AbstractTransformerController
@@ -65,16 +67,6 @@ public class FFmpegController extends AbstractTransformerController
FFmpegController
.class);
// note: subset from Gytheio
public static final String PREFIX_AUDIO = "audio/";
public static final String PREFIX_IMAGE = "image/";
public static final String PREFIX_VIDEO = "video/";
public static final String MEDIATYPE_IMAGE_SVG = "image/svg+xml";
public static final String MEDIATYPE_APPLICATION_PHOTOSHOP = "image/vnd.adobe.photoshop";
public static final String MEDIATYPE_IMG_DWG = "image/vnd.dwg";
@Value("${transform.core.ffmpeg.exe}")
private String execPath;
@@ -125,67 +117,6 @@ public class FFmpegController extends AbstractTransformerController
public void transformImpl(String transformName, String sourceMimetype, String targetMimetype,
Map<String, String> transformOptions, File sourceFile, File targetFile)
{
// note: actual supported transforms are defined by FFmpeg engine config - this is an extra sanity check
if (! isTransformable(sourceMimetype, targetMimetype))
{
throw new UnsupportedOperationException("Unsupported combinations of source/target media types: "+sourceMimetype+","+targetMimetype);
}
commandExecutor.transform(sourceMimetype, targetMimetype, transformOptions, sourceFile, targetFile);
}
/**
* Determines if the source mimetype is supported by ffmpeg
*
* @param mediaType the mimetype to check
* @return Returns true if ffmpeg can handle the given mimetype format
*/
private static boolean isSupportedSource(String mediaType)
{
return ((mediaType.startsWith(PREFIX_VIDEO) && !(
mediaType.equals("video/x-rad-screenplay") ||
mediaType.equals("video/x-sgi-movie") ||
mediaType.equals("video/mpeg2"))) ||
(mediaType.startsWith(PREFIX_AUDIO) && !(
mediaType.equals("audio/vnd.adobe.soundbooth"))) ||
mediaType.equals("application/mxf"));
}
/**
* Determines if FFmpeg can be made to support the given target mimetype.
*
* @param mimetype the mimetype to check
* @return Returns true if ffmpeg can handle the given mimetype format
*/
private static boolean isSupportedTarget(String mimetype)
{
return ((mimetype.startsWith(PREFIX_VIDEO) && !(
mimetype.equals("video/x-rad-screenplay") ||
mimetype.equals("video/x-sgi-movie") ||
mimetype.equals("video/mpeg2"))) ||
(mimetype.startsWith(PREFIX_IMAGE) && !(
mimetype.equals(MEDIATYPE_IMAGE_SVG) ||
mimetype.equals(MEDIATYPE_APPLICATION_PHOTOSHOP) ||
mimetype.equals(MEDIATYPE_IMG_DWG) ||
mimetype.equals("image/vnd.adobe.premiere") ||
mimetype.equals("image/x-portable-anymap") ||
mimetype.equals("image/x-xpixmap") ||
mimetype.equals("image/x-dwt") ||
mimetype.equals("image/cgm") ||
mimetype.equals("image/ief"))) ||
(mimetype.startsWith(PREFIX_AUDIO) && !(
mimetype.equals("audio/vnd.adobe.soundbooth"))));
}
// note: based on Gytheio
private boolean isTransformable(String sourceMediaType, String targetMediaType)
{
if (sourceMediaType.startsWith(PREFIX_AUDIO) &&
targetMediaType.startsWith(PREFIX_IMAGE))
{
// Might be able to support audio to waveform image in the future, but for now...
return false;
}
return (isSupportedSource(sourceMediaType) && isSupportedTarget(targetMediaType));
}
}

4
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/src/test/java/org/alfresco/transformer/FFmpegControllerTest.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@@ -79,6 +79,8 @@ import javax.annotation.PostConstruct;
/**
* Test the FFmpegController without a server.
* Super class includes tests for the AbstractTransformerController.
*
* @author janv
*/
@WebMvcTest(FFmpegController.class)
public class FFmpegControllerTest extends AbstractTransformerControllerTest

4
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/src/test/java/org/alfresco/transformer/FFmpegHttpRequestTest.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@@ -31,6 +31,8 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
/**
* Tests FFmpegController with a server test harness.
*
* @author janv
*/
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class FFmpegHttpRequestTest extends AbstractHttpRequestTest

2
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/src/test/java/org/alfresco/transformer/FFmpegQueueTransformServiceIT.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -

3
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/src/test/resources/ffmpeg_engine_config.json
View File

@@ -11,7 +11,8 @@
{"sourceMediaType": "video/mp4", "targetMediaType": "video/avi" },
{"sourceMediaType": "video/mp4", "targetMediaType": "audio/mpeg" },
{"sourceMediaType": "video/mp4", "targetMediaType": "image/png" },
{"sourceMediaType": "video/mp4", "targetMediaType": "image/jpeg" }
{"sourceMediaType": "video/mp4", "targetMediaType": "image/jpeg" },
{"sourceMediaType": "video/quicktime", "targetMediaType": "video/mp4" }
],
"transformOptions": [
"ffmpegOptions"

2
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg/src/main/java/org/alfresco/transformer/FFmpegOptionsBuilder.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -

5
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg/src/main/java/org/alfresco/transformer/executors/FFmpegCommandExecutor.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@@ -33,7 +33,6 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
import static org.alfresco.transformer.util.RequestParamMap.START_PAGE;
import static org.alfresco.transformer.util.RequestParamMap.TIMEOUT;
import static org.alfresco.transformer.util.RequestParamMap.TIME_OFFSET;
import static org.alfresco.transformer.util.Util.stringToLong;
@@ -41,6 +40,8 @@ import static org.alfresco.transformer.util.Util.stringToLong;
/**
* CommandExecutor implementation for running FFmpeg transformations. It runs the
* transformation logic as a separate Shell process.
*
* @author janv
*/
// TODO PoC for FFmpeg
public class FFmpegCommandExecutor extends AbstractCommandExecutor

3
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg/src/main/resources/ffmpeg_engine_config.json
View File

@@ -11,7 +11,8 @@
{"sourceMediaType": "video/mp4", "targetMediaType": "video/avi" },
{"sourceMediaType": "video/mp4", "targetMediaType": "audio/mpeg" },
{"sourceMediaType": "video/mp4", "targetMediaType": "image/png" },
{"sourceMediaType": "video/mp4", "targetMediaType": "image/jpeg" }
{"sourceMediaType": "video/mp4", "targetMediaType": "image/jpeg" },
{"sourceMediaType": "video/quicktime", "targetMediaType": "video/mp4" }
],
"transformOptions": [
"ffmpegOptions"