Opus enabled

- ozEngine * Opus decoder is enabled and opusfile library is required to build openzone
ducakar · Feb 28, 2017 · 963aa48 · 963aa48
1 parent 2a3760b
commit 963aa48
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,10 +123,10 @@ endif()
 
 find_package(OpenAL REQUIRED)
 find_package(PNG REQUIRED)
-#pkg_check_modules(OPUSFILE REQUIRED opusfile)
+pkg_check_modules(OPUSFILE REQUIRED opusfile)
 pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
 
-#include_directories(SYSTEM ${OPUSFILE_INCLUDE_DIRS})
+include_directories(SYSTEM ${OPUSFILE_INCLUDE_DIRS})
 
 # On embedded platforms, linking is mostly static, so indirect dependencies must be linked too.
 if(PLATFORM_EMBEDDED)

diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ Development packages of the following libraries are required to build OpenZone f
 - Lua or LuaJIT
 - openal-soft
 - OpenGL or OpenGL ES
+- opusfile
 - PhysicsFS
 - SDL2
 - SDL2_ttf

diff --git a/src/ozEngine/AL.cc b/src/ozEngine/AL.cc
@@ -27,9 +27,7 @@
 
 #include <AL/alext.h>
 #include <cstring>
-# ifdef OZ_OPUS
 #include <opus/opusfile.h>
-# endif
 #include <vorbis/vorbisfile.h>
 
 namespace oz
@@ -188,8 +186,6 @@ bool AL::Decoder::WaveStream::decode(AL::Decoder* decoder)
   return true;
 }
 
-#ifdef OZ_OPUS
-
 struct AL::Decoder::OpusStream : AL::Decoder::StreamBase
 {
   OZ_INTERNAL
@@ -218,10 +214,10 @@ struct AL::Decoder::OpusStream : AL::Decoder::StreamBase
       OZ_ERROR("oz::AL::Decoder: Only mono and stereo Opus supported `%s'", file.c());
     }
 
-    decoder->format   = nChannels == 2 ? AL_FORMAT_STEREO_FLOAT32 : AL_FORMAT_MONO_FLOAT32;
-    decoder->rate     = 48000;
-    decoder->capacity = isStreaming ? FRAME_SIZE * nChannels : nSamples * nChannels;
-    decoder->samples  = new float[decoder->capacity];
+    decoder->format_   = nChannels == 2 ? AL_FORMAT_STEREO_FLOAT32 : AL_FORMAT_MONO_FLOAT32;
+    decoder->rate_     = 48000;
+    decoder->capacity_ = isStreaming ? FRAME_SIZE * nChannels : nSamples * nChannels;
+    decoder->samples_  = new float[decoder->capacity_];
   }
 
   OZ_INTERNAL
@@ -242,33 +238,31 @@ AL::Decoder::OpusStream::~OpusStream()
 
 bool AL::Decoder::OpusStream::decode(AL::Decoder* decoder)
 {
-  decoder->count = 0;
+  decoder->size_ = 0;
 
   do {
     int result;
 
-    if (decoder->format == AL_FORMAT_STEREO_FLOAT32) {
-      result = op_read_float_stereo(opFile, decoder->samples + decoder->count,
-                                    decoder->capacity - decoder->count) * 2;
+    if (decoder->format_ == AL_FORMAT_STEREO_FLOAT32) {
+      result = op_read_float_stereo(opFile, decoder->samples_ + decoder->size_,
+                                    decoder->capacity_ - decoder->size_) * 2;
     }
     else {
-      result = op_read_float(opFile, decoder->samples + decoder->count,
-                             decoder->capacity - decoder->count, nullptr);
+      result = op_read_float(opFile, decoder->samples_ + decoder->size_,
+                             decoder->capacity_ - decoder->size_, nullptr);
     }
 
     if (result <= 0) {
-      return decoder->count != 0;
+      return decoder->size_ != 0;
     }
 
-    decoder->count += result;
+    decoder->size_ += result;
   }
-  while (decoder->count != decoder->capacity);
+  while (decoder->size_ != decoder->capacity_);
 
   return true;
 }
 
-#endif
-
 struct AL::Decoder::VorbisStream : AL::Decoder::StreamBase
 {
   OggVorbis_File ovFile;

diff --git a/src/ozEngine/CMakeLists.txt b/src/ozEngine/CMakeLists.txt
@@ -25,9 +25,9 @@ add_library(ozEngine
 #END SOURCES
 )
 
-target_link_libraries(ozEngine ${LUA_LIBRARIES} ${GL_LIBRARIES} ${OPENAL_LIBRARY} ${PNG_LIBRARIES}
-#                               ${OPUSFILE_LIBRARIES}
-                               ${VORBISFILE_LIBRARIES} ${SDL_LIBRARIES} ${SDL_TTF_LIBRARIES})
+target_link_libraries(ozEngine ${LUA_LIBRARIES} ${GL_LIBRARIES} ${OPENAL_LIBRARY}
+                               ${PNG_LIBRARIES} ${OPUSFILE_LIBRARIES} ${VORBISFILE_LIBRARIES}
+                               ${SDL_LIBRARIES} ${SDL_TTF_LIBRARIES})
 
 if(NOT NACL)
 #  target_link_libraries(ozEngine ${SDL_NET_LIBRARIES})

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -18,16 +18,14 @@ if(NOT OZ_GL_ES AND OZ_TOOLS)
   target_link_libraries(noise ozCore ozEngine ozFactory)
 endif()
 
-if (OZ_OPUS)
-  add_executable(opus opus.cc)
-  target_link_libraries(opus ozEngine ozCore -logg -lopus)
-endif()
+#add_executable(opus opus.cc)
+#target_link_libraries(opus ozEngine ozCore)
 
 add_executable(quicksort quicksort.cc)
 target_link_libraries(quicksort ozCore)
 
 add_executable(scratch scratch.cc)
-target_link_libraries(scratch ozCore)
+target_link_libraries(scratch ozEngine ozCore)
 
 add_executable(simd simd.cc)
 target_link_libraries(simd ozCore)
diff --git a/src/tests/opus.cc b/src/tests/opus.cc
@@ -98,7 +98,7 @@ static void decoderMain(void*)
           else {
             nSamples += result * nChannels;
 
-            if (nSamples + FRAME_SIZE * nChannels > samples.length()) {
+            if (nSamples + FRAME_SIZE * nChannels > samples.size()) {
               decodeMainSemaphore.post();
               decodeThreadSemaphore.wait();