Provide refactoring

Author: numq

compose/build.gradle.kts

@@ -23,10 +23,6 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.0")
 }
 
-tasks.withType<JavaCompile> {
-    options.release.set(JavaVersion.VERSION_15.ordinal)
-}
-
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "${JavaVersion.VERSION_15}"
 }

core/build.gradle.kts

@@ -20,12 +20,8 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.0")
 }
 
-tasks.withType<JavaCompile> {
-    options.release.set(JavaVersion.VERSION_11.ordinal)
-}
-
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "${JavaVersion.VERSION_11}"
+    kotlinOptions.jvmTarget = "${JavaVersion.VERSION_15}"
 }
 
 tasks.test {

core/src/main/cpp/.gitignore

@@ -1,4 +1,4 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
+# Compiled Object media, Static and Dynamic libs (Shared Objects)
 *.o
 *.a
 *.so
@@ -13,14 +13,14 @@
 cmake-build-debug/
 cmake-build-release/
 
-# CLion project files
+# CLion project media
 .idea/
 
 # Compiled output
 bin/
 lib/
 
-# Ignore any local user-specific files
+# Ignore any local user-specific media
 .vscode/
 *.suo
 *.user

core/src/main/cpp/CMakeLists.txt

@@ -1,15 +1,17 @@
 cmake_minimum_required(VERSION 3.24)
 project(klarity VERSION 1.0.0)
 
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
 add_library(klarity SHARED
         src/common.cpp
         src/decoder/decoder.cpp
-        src/decoder/com_github_numq_klarity_core_decoder_NativeDecoder.cpp
         src/sampler/sampler.cpp
+        src/decoder/com_github_numq_klarity_core_decoder_NativeDecoder.cpp
         src/sampler/com_github_numq_klarity_core_sampler_NativeSampler.cpp
 )
 
@@ -33,13 +35,57 @@ target_include_directories(klarity PRIVATE
         include/sampler/stretch
 )
 
-target_link_directories(klarity PRIVATE bin/ffmpeg bin/portaudio)
+target_link_directories(klarity PRIVATE
+        bin/ffmpeg
+        bin/portaudio
+)
 
 target_link_libraries(klarity PRIVATE
-        avutil-59
-        swscale-8
-        swresample-5
         avcodec-61
         avformat-61
+        avutil-59
+        swresample-5
+        swscale-8
         libportaudio
-)
+)
+
+#find_package(JNI)
+#
+#add_library(klarity-decoder SHARED
+#        src/decoder/decoder.cpp
+#        src/decoder/com_github_numq_klarity_core_decoder_NativeDecoder.cpp
+#)
+#
+#add_library(klarity-sampler SHARED
+#        src/sampler/sampler.cpp
+#        src/sampler/com_github_numq_klarity_core_sampler_NativeSampler.cpp
+#)
+#
+#if (JNI_FOUND)
+#    message(STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
+#    message(STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
+#    target_include_directories(klarity-decoder PRIVATE ${JNI_INCLUDE_DIRS})
+#    target_include_directories(klarity-sampler PRIVATE ${JNI_INCLUDE_DIRS})
+#else ()
+#    message(FATAL_ERROR "JNI not found.")
+#endif ()
+#
+#target_include_directories(klarity-decoder PRIVATE
+#        include/decoder
+#        include/decoder/ffmpeg
+#)
+#
+#target_include_directories(klarity-sampler PRIVATE
+#        include/sampler
+#        include/sampler/dsp
+#        include/sampler/portaudio
+#        include/sampler/stretch
+#)
+#
+#target_link_directories(klarity-decoder PRIVATE bin/ffmpeg)
+#
+#target_link_directories(klarity-sampler PRIVATE bin/portaudio)
+#
+#target_link_libraries(klarity-decoder PRIVATE avcodec-61 avformat-61 avutil-59 swresample-5 swscale-8)
+#
+#target_link_libraries(klarity-sampler PRIVATE libportaudio)

core/src/main/cpp/include/decoder/com_github_numq_klarity_core_decoder_NativeDecoder.h

@@ -1,10 +1,7 @@
 #include <jni.h>
-#include <memory>
 #include <shared_mutex>
-#include <unordered_map>
 #include "common.h"
 #include "decoder.h"
-#include "decoder-deleter.h"
 
 #ifndef _Included_com_github_numq_klarity_core_decoder_NativeDecoder
 #define _Included_com_github_numq_klarity_core_decoder_NativeDecoder

core/src/main/cpp/include/decoder/decoder-deleter.h

@@ -5,10 +5,10 @@
 #include <iostream>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include "frame.h"
 #include "format.h"
 #include "exception.h"
-#include "decoder-deleter.h"
 
 extern "C" {
 #include "libavutil/imgutils.h"
@@ -20,36 +20,86 @@ extern "C" {
 
 struct Decoder {
 private:
+    class AVPacketGuard {
+    public:
+        AVPacketGuard() {
+            packet = av_packet_alloc();
+        }
+
+        ~AVPacketGuard() {
+            if (packet) {
+                av_packet_free(&packet);
+            }
+        }
+
+        AVPacket *get() { return packet; }
+
+    private:
+        AVPacket *packet = nullptr;
+    };
+
+    class AVFrameGuard {
+    public:
+        AVFrameGuard() {
+            frame = av_frame_alloc();
+        }
+
+        ~AVFrameGuard() {
+            if (frame) {
+                av_frame_free(&frame);
+            }
+        }
+
+        AVFrame *get() { return frame; }
+
+    private:
+        AVFrame *frame = nullptr;
+    };
+
+    const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_FLT;
+
+    const AVPixelFormat pixelFormat = AV_PIX_FMT_RGBA;
+
     std::mutex mutex;
 
-    std::unique_ptr<AVFormatContext, av_format_context_deleter> formatContext;
+    std::vector<uint8_t> audioBuffer;
+
+    std::vector<uint8_t> videoBuffer;
+
+    AVFormatContext *formatContext = nullptr;
 
-    std::unique_ptr<AVCodecContext, av_codec_context_deleter> audioCodecContext;
+    AVCodecContext *audioCodecContext = nullptr;
 
-    std::unique_ptr<AVCodecContext, av_codec_context_deleter> videoCodecContext;
+    AVCodecContext *videoCodecContext = nullptr;
 
-    std::unique_ptr<AVStream> audioStream;
+    SwrContext *swrContext = nullptr;
 
-    std::unique_ptr<AVStream> videoStream;
+    SwsContext *swsContext = nullptr;
 
-    std::unique_ptr<SwsContext, sws_context_deleter> swsContext;
+    int audioStreamIndex = -1;
 
-    std::unique_ptr<SwrContext, swr_context_deleter> swrContext;
+    int videoStreamIndex = -1;
 
-    std::vector<uint8_t> _processAudioFrame(const AVFrame &src);
+    AVCodecContext *_initCodecContext(unsigned int streamIndex);
 
-    std::vector<uint8_t> _processVideoFrame(const AVFrame &src, int64_t width, int64_t height);
+    std::vector<uint8_t> &_processAudioFrame(const AVFrame &src);
+
+    std::vector<uint8_t> &_processVideoFrame(const AVFrame &src, int64_t width, int64_t height);
+
+    void _cleanUp();
 
 public:
-    std::unique_ptr<Format> format{nullptr};
+    Format format;
 
     explicit Decoder(const std::string &location, bool findAudioStream, bool findVideoStream);
 
-    std::unique_ptr<Frame> nextFrame(int64_t width, int64_t height);
+    ~Decoder();
+
+    std::optional<Frame> nextFrame(int64_t width, int64_t height);
 
     void seekTo(long timestampMicros, bool keyframesOnly);
 
     void reset();
 };
 
-#endif //KLARITY_DECODER_DECODER_H
+#endif // KLARITY_DECODER_DECODER_H

core/src/main/cpp/include/decoder/decoder.h

@@ -1,7 +1,5 @@
 #include <jni.h>
-#include <iostream>
 #include <shared_mutex>
-#include <mutex>
 #include "common.h"
 #include "sampler.h"
 

core/src/main/cpp/include/sampler/com_github_numq_klarity_core_sampler_NativeSampler.h

@@ -8,7 +8,6 @@
 #include "exception.h"
 #include "portaudio.h"
 #include "stretch/stretch.h"
-#include "sampler-deleter.h"
 
 struct Sampler {
 private:
@@ -18,17 +17,21 @@ struct Sampler {
 
     uint32_t channels;
 
-    std::unique_ptr<PaStream, pa_stream_deleter> stream;
+    PaStream *stream = nullptr;
 
-    std::unique_ptr<signalsmith::stretch::SignalsmithStretch<float>, signalsmith_stretch_deleter> stretch;
+    signalsmith::stretch::SignalsmithStretch<float> *stretch = nullptr;
 
     float playbackSpeedFactor = 1.0f;
 
     float volume = 1.0f;
 
+    void _cleanUp();
+
 public:
     explicit Sampler(uint32_t sampleRate, uint32_t channels);
 
+    ~Sampler();
+
     void setPlaybackSpeed(float factor);
 
     void setVolume(float value);