shithub: mp3dec

--- a/.gitignore

+++ b/.gitignore

@@ -1,3 +1,4 @@

+.vscode

 fate-suite.ffmpeg.org

 player/SDL

 minimp3

--- a/README.md

+++ b/README.md

@@ -84,7 +84,7 @@

 Also you can use ``MINIMP3_ONLY_MP3`` define to strip MP1/MP2 decoding code.

 MINIMP3_ONLY_SIMD define controls generic (non SSE/NEON) code generation (always enabled on x64/arm64 targets).

 In case you do not want any platform-specific SIMD optimizations, you can define ``MINIMP3_NO_SIMD``.

-MINIMP3_NONSTANDARD_BUT_LOGICAL define saves some code bytes, and enforces non-stadnard but logical behaviour of mono-stereo transition (rare case).

+MINIMP3_NONSTANDARD_BUT_LOGICAL define saves some code bytes, and enforces non-standard but logical behaviour of mono-stereo transition (rare case).

 MINIMP3_FLOAT_OUTPUT makes ``mp3dec_decode_frame()`` output to be float instead of short and additional function mp3dec_f32_to_s16 will be available for float->short conversion if needed.

 Then. we decode the input stream frame-by-frame:

--- a/minimp3.h

+++ b/minimp3.h

@@ -99,7 +99,7 @@

 #if !defined(MINIMP3_NO_SIMD)

-#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(_M_ARM64) || defined(__x86_64__) || defined(__aarch64__))

+#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64))

 /* x64 always have SSE2, arm64 always have neon, no need for generic code */

 #define MINIMP3_ONLY_SIMD

 #endif /* SIMD checks... */

@@ -174,7 +174,7 @@

     return g_have_simd - 1;

 #endif /* MINIMP3_ONLY_SIMD */

-#elif defined(__ARM_NEON) || defined(__aarch64__)

+#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64)

 #include <arm_neon.h>

 #define HAVE_SSE 0

 #define HAVE_SIMD 1

@@ -204,7 +204,7 @@

 #define HAVE_SIMD 0

 #endif /* !defined(MINIMP3_NO_SIMD) */

-#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__)

+#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64)

 #define HAVE_ARMV6 1

 static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a)

--- a/minimp3_ex.h

+++ b/minimp3_ex.h

@@ -976,6 +976,39 @@

     return samples_requested - samples;

+int mp3dec_ex_open_cb(mp3dec_ex_t *dec, mp3dec_io_t *io, int flags)

+{

+    if (!dec || !io || (flags & (~MP3D_FLAGS_MASK)))

+        return MP3D_E_PARAM;

+    memset(dec, 0, sizeof(*dec));

+#ifdef MINIMP3_HAVE_RING

+    int ret;

+    if (ret = mp3dec_open_ring(&dec->file, MINIMP3_IO_SIZE))

+        return ret;

+#else

+    dec->file.size = MINIMP3_IO_SIZE;

+    dec->file.buffer = (const uint8_t*)malloc(dec->file.size);

+    if (!dec->file.buffer)

+        return MP3D_E_MEMORY;

+#endif

+    dec->flags = flags;

+    dec->io = io;

+    mp3dec_init(&dec->mp3d);

+    if (io->seek(0, io->seek_data))

+        return MP3D_E_IOERROR;

+    int ret = mp3dec_iterate_cb(io, (uint8_t *)dec->file.buffer, dec->file.size, mp3dec_load_index, dec);

+    if (ret && MP3D_E_USER != ret)

+        return ret;

+    if (dec->io->seek(dec->start_offset, dec->io->seek_data))

+        return MP3D_E_IOERROR;

+    mp3dec_init(&dec->mp3d);

+    dec->buffer_samples = 0;

+    dec->indexes_built = !(dec->vbr_tag_found || (flags & MP3D_DO_NOT_SCAN));

+    dec->flags &= (~MP3D_DO_NOT_SCAN);

+    return 0;

+}

 #ifndef MINIMP3_NO_STDIO

 #if defined(__linux__) || defined(__FreeBSD__)

@@ -1296,38 +1329,6 @@

     return mp3dec_ex_open_mapinfo(dec, flags);

-int mp3dec_ex_open_cb(mp3dec_ex_t *dec, mp3dec_io_t *io, int flags)

-{

-    if (!dec || !io || (flags & (~MP3D_FLAGS_MASK)))

-        return MP3D_E_PARAM;

-    memset(dec, 0, sizeof(*dec));

-#ifdef MINIMP3_HAVE_RING

-    int ret;

-    if (ret = mp3dec_open_ring(&dec->file, MINIMP3_IO_SIZE))

-        return ret;

-#else

-    dec->file.size = MINIMP3_IO_SIZE;

-    dec->file.buffer = (const uint8_t*)malloc(dec->file.size);

-    if (!dec->file.buffer)

-        return MP3D_E_MEMORY;

-#endif

-    dec->flags = flags;

-    dec->io = io;

-    mp3dec_init(&dec->mp3d);

-    if (io->seek(0, io->seek_data))

-        return MP3D_E_IOERROR;

-    int ret = mp3dec_iterate_cb(io, (uint8_t *)dec->file.buffer, dec->file.size, mp3dec_load_index, dec);

-    if (ret && MP3D_E_USER != ret)

-        return ret;

-    if (dec->io->seek(dec->start_offset, dec->io->seek_data))

-        return MP3D_E_IOERROR;

-    mp3dec_init(&dec->mp3d);

-    dec->buffer_samples = 0;

-    dec->indexes_built = !(dec->vbr_tag_found || (flags & MP3D_DO_NOT_SCAN));

-    dec->flags &= (~MP3D_DO_NOT_SCAN);

-    return 0;

-}

 void mp3dec_ex_close(mp3dec_ex_t *dec)

 #ifdef MINIMP3_HAVE_RING

@@ -1383,6 +1384,13 @@

 #else /* MINIMP3_NO_STDIO */

 void mp3dec_ex_close(mp3dec_ex_t *dec)

+#ifdef MINIMP3_HAVE_RING

+    if (dec->io)

+        mp3dec_close_ring(&dec->file);

+#else

+    if (dec->io && dec->file.buffer)

+        free((void*)dec->file.buffer);

+#endif

     if (dec->index.frames)

         free(dec->index.frames);

     memset(dec, 0, sizeof(*dec));

--- a/minimp3_test.c

+++ b/minimp3_test.c

@@ -402,7 +402,7 @@

         int len_match = ref_samples == info.samples;

         int relaxed_len_match = len_match || (ref_samples + 1152) == info.samples || (ref_samples + 2304) == info.samples;

         int seek_len_match = (ref_samples <= info.samples) || (ref_samples + 2304) >= info.samples;

-        if ((((!relaxed_len_match && MODE_STREAM != mode && MODE_STREAM_BUF != mode && MODE_STREAM_CB != mode) || !seek_len_match) && 3 == info.layer && !no_std_vec) || (no_std_vec && !len_match))

+        if ((((!relaxed_len_match && MODE_STREAM != mode && MODE_STREAM_BUF != mode && MODE_STREAM_CB != mode) || !seek_len_match) && (3 == info.layer || 0 == info.layer) && !no_std_vec) || (no_std_vec && !len_match))

         {   /* some standard vectors are for some reason a little shorter */

             printf("error: reference and produced number of samples do not match (%d/%d)\n", (int)ref_samples, (int)info.samples);

             exit(1);