Skip to content

Add support for opus audio #54

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
merged 1 commit into from
Mar 16, 2018
Merged

Add support for opus audio #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions app/src/main/java/protect/videotranscoder/media/AudioCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public enum AudioCodec
{
AAC("aac", Arrays.asList("1", "2")),
MP3("mp3", Arrays.asList("1", "2")),
OPUS("libopus", Arrays.asList("1", "2")),
VORBIS("vorbis", Collections.singletonList("2")),
NONE("none", Collections.EMPTY_LIST),
;
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/protect/videotranscoder/media/MediaContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ public enum MediaContainer
{
// Video and audio:
FLV("flv", "flv", "video/x-flv", Collections.singletonList(VideoCodec.H264), Arrays.asList(AudioCodec.AAC, AudioCodec.MP3, AudioCodec.NONE)),
MKV("matroska", "mkv", "video/x-matroska", Arrays.asList(VideoCodec.H264, VideoCodec.MPEG4, VideoCodec.MPEG2, VideoCodec.MPEG1), Arrays.asList(AudioCodec.AAC, AudioCodec.MP3, AudioCodec.NONE)),
MKV("matroska", "mkv", "video/x-matroska", Arrays.asList(VideoCodec.H264, VideoCodec.MPEG4, VideoCodec.MPEG2, VideoCodec.MPEG1), Arrays.asList(AudioCodec.AAC, AudioCodec.MP3, AudioCodec.OPUS, AudioCodec.NONE)),
MP4("mp4", "mp4", "video/mp4", Arrays.asList(VideoCodec.H264, VideoCodec.MPEG4, VideoCodec.MPEG2, VideoCodec.MPEG1), Arrays.asList(AudioCodec.AAC, AudioCodec.MP3, AudioCodec.NONE)),
GIF("gif", "gif", "image/gif", Arrays.asList(VideoCodec.GIF), Collections.EMPTY_LIST),

// Audio only
MP3("mp3", "mp3", "audio/mp3", new ArrayList<VideoCodec>(), Collections.singletonList(AudioCodec.MP3)),
OGG("ogg", "ogg", "audio/ogg", new ArrayList<VideoCodec>(), Arrays.asList(AudioCodec.VORBIS)),
OPUS("opus", "opus", "audio/ogg", new ArrayList<VideoCodec>(), Arrays.asList(AudioCodec.OPUS)),
;

public final String ffmpegName;
Expand Down