Skip to content

Enable x-msvideo conversion #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rob93c merged 3 commits into from
Nov 30, 2024
Merged

Enable x-msvideo conversion #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0756d74
enable support for x-msvideo conversion
rob93c Nov 29, 2024
68c4ccb
add concurrent test to check on avi video conversion
rob93c Nov 29, 2024
c352b37
fix expected video duration
rob93c Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public final class MediaHelper {
static final ProcessLocator FFMPEG_LOCATOR = new PathLocator();
private static final int PRESERVE_ASPECT_RATIO = -2;
private static final List<String> SUPPORTED_VIDEOS = List.of("image/gif", "video/quicktime", "video/webm",
"video/mp4", "video/x-m4v", "application/x-matroska");
"video/mp4", "video/x-m4v", "application/x-matroska", "video/x-msvideo");

/**
* Based on the type of passed-in file, it converts it into the proper media.
Expand Down
16 changes: 16 additions & 0 deletions src/test/java/com/github/stickerifier/stickerify/media/MediaHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,14 @@ void convertGifVideo() throws Exception {
assertVideoConsistency(result, 512, 274, 10F, 1_000L);
}

@Test
void convertAviVideo() throws Exception {
var aviVideo = loadResource("valid.avi");
var result = MediaHelper.convert(aviVideo);

assertVideoConsistency(result, 512, 512, 30F, 3_000L);
}

@Test
void noVideoConversionNeeded() throws Exception {
var webmVideo = loadResource("no_conversion_needed.webm");
Expand Down Expand Up @@ -319,6 +327,14 @@ void concurrentWebmVideoConversions() {
executeConcurrentConversionsOf(webmVideo);
}

@Test
@DisplayName("avi videos")
void concurrentAviVideoConversions() {
var aviVideo = loadResource("valid.avi");

executeConcurrentConversionsOf(aviVideo);
}

@Test
@DisplayName("gif videos")
void concurrentGifVideoConversions() {
Expand Down
Binary file added src/test/resources/valid.avi
View file
Open in desktop
Binary file not shown.
Loading