Opus codec support.

Author: BorisCarvajal

.travis.yml

@@ -13,9 +13,9 @@ before_install:
          export DISPLAY=:99.0;
          sh -e /etc/init.d/xvfb start;
          sudo apt-get update;
-         sudo apt-get install -y libvorbis-dev libtheora-dev libphysfs-dev libdumb1-dev libflac-dev libpulse-dev libgtk2.0-dev pandoc;
+         sudo apt-get install -y libopusfile-dev libvorbis-dev libtheora-dev libphysfs-dev libdumb1-dev libflac-dev libpulse-dev libgtk2.0-dev pandoc;
       elif [ `uname` = "Darwin" ]; then
-         brew install cmake libvorbis freetype flac physfs;
+         brew install cmake opusfile libvorbis freetype flac physfs;
       fi
 
 env:

README.txt

@@ -110,6 +110,9 @@ These are the dependencies required for the addons:
 - Ogg Vorbis, a free lossy audio format. (libogg, libvorbis, libvorbisfile)
   Home page: <http://www.vorbis.com/>
 
+- Opus, a free lossy audio codec. (libogg, libopus, libopusfile)
+  Home page: <http://www.opus-codec.org/>
+
 - FLAC, a free lossless audio codec. (libFLAC, libogg)
   Home page: <http://flac.sourceforge.net/>
 

addons/acodec/CMakeLists.txt

@@ -6,6 +6,7 @@ if(WIN32)
 endif()
 option(WANT_VORBIS "Enable Ogg Vorbis support using libvorbis" on)
 option(WANT_TREMOR "Enable Ogg Vorbis support using Tremor" off)
+option(WANT_OPUS "Enable Opus support using libopus" on)
 option(WANT_MODAUDIO "Enable MOD Audio support" on)
 option(WANT_ACODEC_DYNAMIC_LOAD "Enable DLL loading in acodec (Windows)" off)
 
@@ -268,6 +269,63 @@ if(SUPPORT_VORBIS)
     endif()
 endif(SUPPORT_VORBIS)
 
+#
+# Opus
+#
+
+if(WANT_OPUS)
+    find_package(Opus)
+    if(OPUS_FOUND)
+        set(CMAKE_REQUIRED_INCLUDES ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
+        if(COMPILER_GCC_OR_CLANG)
+            # libm is required when linking statically.
+            set(CMAKE_REQUIRED_LIBRARIES "${OPUS_LIBRARIES};m")
+        else()
+            set(CMAKE_REQUIRED_LIBRARIES "${OPUS_LIBRARIES}")
+        endif(COMPILER_GCC_OR_CLANG)
+        run_c_compile_test("
+            #include <opus/opusfile.h>
+            int main(void)
+            {
+                OggOpusFile *f;
+                OpusHead *v = 0;
+                (void)v;
+                op_free(f);
+                return 0;
+            }"
+            OPUS_COMPILES)
+        set(CMAKE_REQUIRED_INCLUDES)
+        set(CMAKE_REQUIRED_LIBRARIES)
+        if(OPUS_COMPILES)
+            set(SUPPORT_OPUS 1)
+        endif()
+    endif(OPUS_FOUND)
+    if(NOT SUPPORT_OPUS)
+        message("WARNING: libopus not found or compile test failed, disabling support.")
+    endif(NOT SUPPORT_OPUS)
+endif()
+
+if(SUPPORT_OPUS)
+    include_directories(SYSTEM ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
+    set(ALLEGRO_CFG_ACODEC_OPUS 1)
+    list(APPEND ACODEC_SOURCES opus.c)
+
+    list(APPEND ACODEC_INCLUDE_DIRECTORIES ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
+
+    if(WIN32 AND WANT_ACODEC_DYNAMIC_LOAD)
+        if(OPUSFILE_LIBRARY MATCHES "${WIN32_STATIC_LIB_REGEX}")
+            message("WARNING: Dynamic loading will be disabled for Opus"
+                    " as static library was found: ${OPUSFILE_LIBRARY}")
+        else()
+            get_dll_name(${OPUSFILE_LIBRARY} ALLEGRO_CFG_ACODEC_OPUSFILE_DLL)
+        endif()
+    endif()
+
+    if(NOT ALLEGRO_CFG_ACODEC_OPUSFILE_DLL)
+        list(APPEND ACODEC_LIBRARIES ${OPUS_LIBRARIES})
+    endif()
+endif(SUPPORT_OPUS)
+
 configure_file(
     allegro5/internal/aintern_acodec_cfg.h.cmake
     ${PROJECT_BINARY_DIR}/include/allegro5/internal/aintern_acodec_cfg.h

addons/acodec/acodec.c

@@ -55,6 +55,13 @@ bool al_init_acodec_addon(void)
    ret &= al_register_audio_stream_loader_f(".ogg", _al_load_ogg_vorbis_audio_stream_f);
 #endif
 
+#ifdef ALLEGRO_CFG_ACODEC_OPUS
+   ret &= al_register_sample_loader(".opus", _al_load_ogg_opus);
+   ret &= al_register_audio_stream_loader(".opus", _al_load_ogg_opus_audio_stream);
+   ret &= al_register_sample_loader_f(".opus", _al_load_ogg_opus_f);
+   ret &= al_register_audio_stream_loader_f(".opus", _al_load_ogg_opus_audio_stream_f);
+#endif
+
    return ret;
 }
 

addons/acodec/acodec.h

@@ -58,6 +58,14 @@ ALLEGRO_AUDIO_STREAM *_al_load_ogg_vorbis_audio_stream_f(ALLEGRO_FILE* file,
    size_t buffer_count, unsigned int samples);
 #endif
 
+#ifdef ALLEGRO_CFG_ACODEC_OPUS
+ALLEGRO_SAMPLE *_al_load_ogg_opus(const char *filename);
+ALLEGRO_SAMPLE *_al_load_ogg_opus_f(ALLEGRO_FILE *file);
+ALLEGRO_AUDIO_STREAM *_al_load_ogg_opus_audio_stream(const char *filename,
+   size_t buffer_count, unsigned int samples);
+ALLEGRO_AUDIO_STREAM *_al_load_ogg_opus_audio_stream_f(ALLEGRO_FILE* file,
+   size_t buffer_count, unsigned int samples);
+#endif
 
 
 #endif

addons/acodec/allegro5/internal/aintern_acodec_cfg.h.cmake

@@ -2,9 +2,11 @@
 #cmakedefine ALLEGRO_CFG_ACODEC_MODAUDIO
 #cmakedefine ALLEGRO_CFG_ACODEC_VORBIS
 #cmakedefine ALLEGRO_CFG_ACODEC_TREMOR
+#cmakedefine ALLEGRO_CFG_ACODEC_OPUS
 
 
 /* Define if the library should be loaded dynamically. */
 #cmakedefine ALLEGRO_CFG_ACODEC_FLAC_DLL "@ALLEGRO_CFG_ACODEC_FLAC_DLL@"
 #cmakedefine ALLEGRO_CFG_ACODEC_DUMB_DLL "@ALLEGRO_CFG_ACODEC_DUMB_DLL@"
 #cmakedefine ALLEGRO_CFG_ACODEC_VORBISFILE_DLL "@ALLEGRO_CFG_ACODEC_VORBISFILE_DLL@"
+#cmakedefine ALLEGRO_CFG_ACODEC_OPUSFILE_DLL "@ALLEGRO_CFG_ACODEC_OPUSFILE_DLL@"