Skip to content

[AudioFormat] Add FLAC and OPUS, correct AAC container #5218

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

Draft
Nadahar wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[AudioFormat] Add FLAC and OPUS, correct AAC container #5218

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
33 changes: 32 additions & 1 deletion bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ public class AudioFormat {
null, null, null);

// generic AAC format without any further constraints
public static final AudioFormat AAC = new AudioFormat(AudioFormat.CONTAINER_NONE, AudioFormat.CODEC_AAC, null, null,
public static final AudioFormat AAC = new AudioFormat(AudioFormat.CONTAINER_MP4, AudioFormat.CODEC_AAC, null, null,
null, null);

// generic FLAC format without any further constraints
public static final AudioFormat FLAC = new AudioFormat(AudioFormat.CONTAINER_FLAC, AudioFormat.CODEC_FLAC, null,
null, null, null);

/**
* {@code AudioCodec} encoded data without any container header or footer,
* e.g. MP3 is a non-container format
Expand All @@ -63,6 +67,23 @@ public class AudioFormat {
*/
public static final String CONTAINER_WAVE = "WAVE";

/**
* FLAC container format
*
* @see <a href="https://en.wikipedia.org/wiki/FLAC#File_structure">FLAC File Structure</a>
*/
public static final String CONTAINER_FLAC = "FLAC";

/**
* MPEG-4 Part 14 container format, an extension of ISO base media file format. Often seen with
* {@code .mp4}, {@code .m4a}, {@code .m4p}, {@code .m4b} or {@code .m4v} extensions, but it's also
* the "parent" for many other formats.
*
* @see <a href="https://en.wikipedia.org/wiki/MP4_file_format"></a>
* @see <a href="">https://en.wikipedia.org/wiki/ISO_base_media_file_format</a>
*/
public static final String CONTAINER_MP4 = "MP4";

/**
* OGG container format
*
Expand Down Expand Up @@ -117,6 +138,16 @@ public class AudioFormat {
*/
public static final String CODEC_AAC = "AAC";

/**
* Free Lossless Audio Codec
*/
public static final String CODEC_FLAC = "FLAC";

/**
* Opus
*/
public static final String CODEC_OPUS = "OPUS";

/**
* Codec
*/
Expand Down