Code cleanups

7 files changed, 15 insertions, 27 deletions

diff --git a/include/kitchensink/internal/kitdecoder.h b/include/kitchensink/internal/kitdecoder.h
index 520d402..89a293e 100644
--- a/include/kitchensink/internal/kitdecoder.h
+++ b/include/kitchensink/internal/kitdecoder.h
@@ -16,7 +16,7 @@
 

 typedef struct Kit_Decoder Kit_Decoder;

 

-typedef int (*dec_decode_cb)(Kit_Decoder *dec, AVPacket *in_packet);

+typedef void (*dec_decode_cb)(Kit_Decoder *dec, AVPacket *in_packet);

 typedef void (*dec_close_cb)(Kit_Decoder *dec);

 typedef void (*dec_free_packet_cb)(void *packet);

 

diff --git a/include/kitchensink/internal/utils/kitlog.h b/include/kitchensink/internal/utils/kitlog.h
index 6b24763..d298592 100644
--- a/include/kitchensink/internal/utils/kitlog.h
+++ b/include/kitchensink/internal/utils/kitlog.h
@@ -2,10 +2,10 @@
 #define KITLOG_H

 

 #ifdef NDEBUG

-    #define LOG(...)

+#define LOG(...)

 #else

-    #include <stdio.h>

-    #define LOG(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)

+#include <stdio.h>

+#define LOG(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)

 #endif

 

 #endif // KITLOG_H

diff --git a/include/kitchensink/internal/utils/kitringbuffer.h b/include/kitchensink/internal/utils/kitringbuffer.h
index 2f67520..153dfd4 100644
--- a/include/kitchensink/internal/utils/kitringbuffer.h
+++ b/include/kitchensink/internal/utils/kitringbuffer.h
@@ -6,7 +6,8 @@
 typedef struct Kit_RingBuffer {
     int size;
     int len;
-    int wpos, rpos;
+    int wpos;
+    int rpos;
     char* data;
 } Kit_RingBuffer;
 
diff --git a/src/internal/audio/kitaudio.c b/src/internal/audio/kitaudio.c
index f31e582..bcf6681 100644
--- a/src/internal/audio/kitaudio.c
+++ b/src/internal/audio/kitaudio.c
@@ -74,16 +74,12 @@ void _FindAudioFormat(enum AVSampleFormat fmt, int *bytes, bool *is_signed, unsi
             *is_signed = false;

             *format = AUDIO_U8;

             break;

-        case AV_SAMPLE_FMT_S16:

-            *bytes = 2;

-            *is_signed = true;

-            *format = AUDIO_S16SYS;

-            break;

         case AV_SAMPLE_FMT_S32:

             *bytes = 4;

             *is_signed = true;

             *format = AUDIO_S32SYS;

             break;

+        case AV_SAMPLE_FMT_S16:

         default:

             *bytes = 2;

             *is_signed = true;

@@ -98,7 +94,7 @@ static void free_out_audio_packet_cb(void *packet) {
     free(p);

 }

 

-static int dec_decode_audio_cb(Kit_Decoder *dec, AVPacket *in_packet) {

+static void dec_decode_audio_cb(Kit_Decoder *dec, AVPacket *in_packet) {

     assert(dec != NULL);

     assert(in_packet != NULL);

 

@@ -113,7 +109,7 @@ static int dec_decode_audio_cb(Kit_Decoder *dec, AVPacket *in_packet) {
     while(in_packet->size > 0) {

         len = avcodec_decode_audio4(dec->codec_ctx, audio_dec->scratch_frame, &frame_finished, in_packet);

         if(len < 0) {

-            return 1;

+            return;

         }

 

         if(frame_finished) {

@@ -161,9 +157,6 @@ static int dec_decode_audio_cb(Kit_Decoder *dec, AVPacket *in_packet) {
         in_packet->size -= len;

         in_packet->data += len;

     }

-

-

-    return 1;

 }

 

 static void dec_close_audio_cb(Kit_Decoder *dec) {

diff --git a/src/internal/kitdecoder.c b/src/internal/kitdecoder.c
index 4af927c..a16663e 100644
--- a/src/internal/kitdecoder.c
+++ b/src/internal/kitdecoder.c
@@ -213,7 +213,6 @@ int Kit_RunDecoder(Kit_Decoder *dec) {
 

     AVPacket *in_packet;

     int is_output_full = 1;

-    int ret;

 

     // First, check if there is room in output buffer

     if(SDL_LockMutex(dec->lock[KIT_DEC_OUT]) == 0) {

@@ -231,11 +230,11 @@ int Kit_RunDecoder(Kit_Decoder *dec) {
     }

 

     // Run decoder with incoming packet

-    ret = dec->dec_decode(dec, in_packet);

+    dec->dec_decode(dec, in_packet);

 

     // Free raw packet before returning

     av_packet_free(&in_packet);

-    return ret;

+    return 1;

 }

 

 void Kit_CloseDecoder(Kit_Decoder *dec) {

diff --git a/src/internal/subtitle/kitsubtitle.c b/src/internal/subtitle/kitsubtitle.c
index c1b5973..8935efc 100644
--- a/src/internal/subtitle/kitsubtitle.c
+++ b/src/internal/subtitle/kitsubtitle.c
@@ -34,7 +34,7 @@ static void free_out_subtitle_packet_cb(void *packet) {
     Kit_FreeSubtitlePacket((Kit_SubtitlePacket*)packet);

 }

 

-static int dec_decode_subtitle_cb(Kit_Decoder *dec, AVPacket *in_packet) {

+static void dec_decode_subtitle_cb(Kit_Decoder *dec, AVPacket *in_packet) {

     assert(dec != NULL);

     assert(in_packet != NULL);

 

@@ -46,7 +46,7 @@ static int dec_decode_subtitle_cb(Kit_Decoder *dec, AVPacket *in_packet) {
     if(in_packet->size > 0) {

         len = avcodec_decode_subtitle2(dec->codec_ctx, &subtitle_dec->scratch_frame, &frame_finished, in_packet);

         if(len < 0) {

-            return 1;

+            return;

         }

 

         if(frame_finished) {

@@ -73,8 +73,6 @@ static int dec_decode_subtitle_cb(Kit_Decoder *dec, AVPacket *in_packet) {
             avsubtitle_free(&subtitle_dec->scratch_frame);

         }

     }

-

-    return 1;

 }

 

 static void dec_close_subtitle_cb(Kit_Decoder *dec) {

diff --git a/src/internal/video/kitvideo.c b/src/internal/video/kitvideo.c
index ff3d05c..5254d9e 100644
--- a/src/internal/video/kitvideo.c
+++ b/src/internal/video/kitvideo.c
@@ -71,7 +71,7 @@ static void free_out_video_packet_cb(void *packet) {
     free(p);

 }

 

-static int dec_decode_video_cb(Kit_Decoder *dec, AVPacket *in_packet) {

+static void dec_decode_video_cb(Kit_Decoder *dec, AVPacket *in_packet) {

     assert(dec != NULL);

     assert(in_packet != NULL);

     

@@ -82,7 +82,7 @@ static int dec_decode_video_cb(Kit_Decoder *dec, AVPacket *in_packet) {
     while(in_packet->size > 0) {

         int len = avcodec_decode_video2(dec->codec_ctx, video_dec->scratch_frame, &frame_finished, in_packet);

         if(len < 0) {

-            return 1;

+            return;

         }

 

         if(frame_finished) {

@@ -117,9 +117,6 @@ static int dec_decode_video_cb(Kit_Decoder *dec, AVPacket *in_packet) {
         in_packet->size -= len;

         in_packet->data += len;

     }

-

-

-    return 1;

 }

 

 static void dec_close_video_cb(Kit_Decoder *dec) {