From be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 8 Jan 2024 12:32:33 -0500 Subject: Cleanup Signed-off-by: Andrew Opalach --- src/bimu/handlers/codec_client.c | 6 ++---- src/bimu/handlers/codec_server.c | 3 --- src/buffer/video.c | 2 +- src/codec/meson.build | 19 +++++++------------ src/libsink/sink.c | 2 +- src/mixer/audio_miniaudio.c | 1 - 6 files changed, 11 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/bimu/handlers/codec_client.c b/src/bimu/handlers/codec_client.c index eda453f..570ef97 100644 --- a/src/bimu/handlers/codec_client.c +++ b/src/bimu/handlers/codec_client.c @@ -1,10 +1,8 @@ +#include "../../codec/codec.h" #include "../../codec/libav/decoder.h" #include "../../codec/libav/packet_ext.h" -#include "../../codec/stb_image/decoder.h" -#include "../../codec/wuffs/decoder.h" -#include "../../codec/spng/decoder.h" -#include "../../bimu/local.h" +#include "../../bimu/client.h" #include "codec.h" diff --git a/src/bimu/handlers/codec_server.c b/src/bimu/handlers/codec_server.c index 99c4e71..ca1c1b8 100644 --- a/src/bimu/handlers/codec_server.c +++ b/src/bimu/handlers/codec_server.c @@ -1,9 +1,6 @@ #include "../../codec/codec.h" #include "../../codec/libav/demuxer.h" #include "../../codec/libav/packet_ext.h" -#include "../../codec/stb_image/demuxer.h" -#include "../../codec/wuffs/demuxer.h" -#include "../../codec/spng/demuxer.h" #include "../handler.h" diff --git a/src/buffer/video.c b/src/buffer/video.c index 106e40f..de1f025 100644 --- a/src/buffer/video.c +++ b/src/buffer/video.c @@ -5,7 +5,7 @@ //#define CAMU_VIDEO_BUFFER_FORCE_SCALER #define BUFFER_WATERMARK_LOW 16 // frames. -#define BUFFER_WATERMARK_BUFFERED 22 +#define BUFFER_WATERMARK_BUFFERED 12 #define BUFFER_WATERMARK_HIGH 28 #define BUFFER_WATERMARK_RESET BUFFER_WATERMARK_HIGH + 16. diff --git a/src/codec/meson.build b/src/codec/meson.build index b4472fb..a3951f0 100644 --- a/src/codec/meson.build +++ b/src/codec/meson.build @@ -11,15 +11,6 @@ av_src = [ av_inc = [] av_deps = [] -#libdir = meson.source_root() + '/build-mingw/subprojects/ffmpeg-6.0/dist/msys64/clang64lib' -#incdir = meson.source_root() + '/build-mingw/subprojects/ffmpeg-6.0/dist/msys64/clang64include' -#av_inc += [include_directories(incdir)] -#libavutil = compiler.find_library('avutil', dirs: libdir) -#libavformat = compiler.find_library('avformat', dirs: libdir) -#libavcodec = compiler.find_library('avcodec', dirs: libdir) -#libswresample = compiler.find_library('swresample', dirs: libdir) -#libswscale = compiler.find_library('swscale', dirs: libdir) - libavutil = dependency('libavutil', required: false) libavformat = dependency('libavformat', required: false) libavcodec = dependency('libavcodec', required: false) @@ -33,6 +24,12 @@ if not (libavutil.found() and libavformat.found() and libavcodec.found() and lib libavcodec = av_proj.get_variable('avcodec') libswresample = av_proj.get_variable('swresample') libswscale = av_proj.get_variable('swscale') + #libdir = av_proj.get_variable('libdir') + #libavutil = compiler.find_library('avutil', dirs: libdir) + #libavformat = compiler.find_library('avformat', dirs: libdir) + #libavcodec = compiler.find_library('avcodec', dirs: libdir) + #libswresample = compiler.find_library('swresample', dirs: libdir) + #libswscale = compiler.find_library('swscale', dirs: libdir) zlib = compiler.find_library('z', required: false) if zlib.found() av_deps += [zlib] @@ -41,9 +38,7 @@ if not (libavutil.found() and libavformat.found() and libavcodec.found() and lib if soxr.found() av_deps += [soxr] endif - if av_proj.get_variable('is_msvc') - av_deps += [compiler.find_library('Bcrypt', required: true)] - endif + av_deps += [compiler.find_library('bcrypt')] av_inc += [av_proj.get_variable('inc')] endif endif diff --git a/src/libsink/sink.c b/src/libsink/sink.c index d49e87b..58e3db3 100644 --- a/src/libsink/sink.c +++ b/src/libsink/sink.c @@ -317,7 +317,7 @@ static void client_callback(void *userdata, u8 op, struct bmu_client_stream *str break; } case BIMU_CLIENT_CONFIGURE: { - // No data can be sent before this step. + // No data can be sent until all active streams are configured. switch (stream->type) { case BIMU_STREAM_AUDIO: entry->audio.stream = stream; diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c index 38cb91d..b77323a 100644 --- a/src/mixer/audio_miniaudio.c +++ b/src/mixer/audio_miniaudio.c @@ -4,7 +4,6 @@ static ma_backend backends[] = { #ifndef _WIN32 -// ma_backend_alsa, ma_backend_pulseaudio, #else ma_backend_wasapi -- cgit v1.2.3-101-g0448