Merge branch 'master' of https://github.com/commarmi76/libmp3lame_for…

…_esp32

components/libmp3lame/include/config.h

@@ -1,86 +1,86 @@
-/* expat_config.h.  Generated from expat_config.h.in by configure.  */
-/* expat_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#define BYTEORDER 1234
-
-/* Define to 1 if you have the `bcopy' function. */
-#define HAVE_BCOPY 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* whether byteorder is bigendian */
-/* #undef WORDS_BIGENDIAN */
-
-
-
-/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */
-/* #undef __func__ */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-#undef HAVE_NASM
-#undef HAVE_MPGLIB
-#undef HAVE_XMMINTRIN_H
-
-#undef TAKEHIRO_IEEE754_HACK
+/* expat_config.h.  Generated from expat_config.h.in by configure.  */
+/* expat_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
+#define BYTEORDER 1234
+
+/* Define to 1 if you have the `bcopy' function. */
+#define HAVE_BCOPY 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* whether byteorder is bigendian */
+/* #undef WORDS_BIGENDIAN */
+
+
+
+/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */
+/* #undef __func__ */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+#undef HAVE_NASM
+#undef HAVE_MPGLIB
+#undef HAVE_XMMINTRIN_H
+
+#undef TAKEHIRO_IEEE754_HACK

components/libmp3lame/library/gain_analysis.c

@@ -286,7 +286,13 @@ ResetSampleFrequency(replaygain_t * rgData, long samplefreq)
     rgData->totsamp = 0;
 
     //memset(rgData->A, 0, sizeof(rgData->A));
-    memset(rgData->A, 0, 12000*sizeof(sizeof(uint32_t)));
+    //memset(rgData->A, 0, 12000*sizeof(uint32_t));
+
+    for (int i=0; i<12000; i++)
+    {
+    	gfc->sv_rpg.rgdata->A[i]=0;
+    }
+
 
     return INIT_GAIN_ANALYSIS_OK;
 }
@@ -306,7 +312,12 @@ InitGainAnalysis(replaygain_t * rgData, long samplefreq)
     rgData->rout = rgData->routbuf + MAX_ORDER;
 
     //memset(rgData->B, 0, sizeof(rgData->B));
-    memset(rgData->B, 0, 12000*sizeof(sizeof(uint32_t)));
+    //memset(rgData->B, 0, 12000*sizeof(uint32_t));
+
+    for (int i=0; i<12000; i++)
+    {
+    	gfc->sv_rpg.rgdata->B[i]=0;
+    }
 
     return INIT_GAIN_ANALYSIS_OK;
 }

components/libmp3lame/library/lame.c

@@ -597,10 +597,10 @@ lame_init_params(lame_global_flags * gfp)
 
   //  gfc->sv_rpg.rgdata->A = calloc (12000, sizeof(uint32_t));
     gfc->sv_rpg.rgdata->A = pvPortMallocCaps(12000*sizeof(uint32_t), MALLOC_CAP_32BIT);
-//    memset(gfc->sv_rpg.rgdata->A, 0, 12000*sizeof(sizeof(uint32_t)));
+//    memset(gfc->sv_rpg.rgdata->A, 0, 12000*sizeof(uint32_t));
  //   gfc->sv_rpg.rgdata->B = calloc (12000, sizeof(uint32_t));
     gfc->sv_rpg.rgdata->B = pvPortMallocCaps(12000*sizeof(uint32_t), MALLOC_CAP_32BIT);
-//    memset(gfc->sv_rpg.rgdata->B, 0, 12000*sizeof(sizeof(uint32_t)));
+//    memset(gfc->sv_rpg.rgdata->B, 0, 12000*sizeof(uint32_t));
 
     for (int i=0; i<12000; i++)
     {