avconv: flush decoders immediately after an EOF.

[ffmpeg] / libavutil / mem.c

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 251b1fadab9cddbb38ed433c0cb91b409433cd40..bf1a542db8fceb223e8fe6ec5ebd8d08fdfd00de 100644 (file)
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -2,26 +2,26 @@
  * default memory allocator for libavutil
  * Copyright (c) 2002 Fabrice Bellard
  *
  * default memory allocator for libavutil
  * Copyright (c) 2002 Fabrice Bellard
  *

- * This file is part of FFmpeg.
+ * This file is part of Libav.

  *
  *

- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or

  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *

- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public

- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**

- * @file mem.c
- * default memory allocator for libavutil.
+ * @file
+ * default memory allocator for libavutil

  */
 
 #include "config.h"
  */
 
 #include "config.h"


@@ -33,55 +33,73 @@
 #include <malloc.h>
 #endif
 
 #include <malloc.h>
 #endif
 

+#include "avutil.h"

 #include "mem.h"
 
 #include "mem.h"
 

-/* here we can use OS dependent allocation functions */
+/* here we can use OS-dependent allocation functions */

 #undef free
 #undef malloc
 #undef realloc
 
 #undef free
 #undef malloc
 #undef realloc
 

-/* you can redefine av_malloc and av_free in your project to use your
+#ifdef MALLOC_PREFIX
+
+#define malloc         AV_JOIN(MALLOC_PREFIX, malloc)
+#define memalign       AV_JOIN(MALLOC_PREFIX, memalign)
+#define posix_memalign AV_JOIN(MALLOC_PREFIX, posix_memalign)
+#define realloc        AV_JOIN(MALLOC_PREFIX, realloc)
+#define free           AV_JOIN(MALLOC_PREFIX, free)
+
+void *malloc(size_t size);
+void *memalign(size_t align, size_t size);
+int   posix_memalign(void **ptr, size_t align, size_t size);
+void *realloc(void *ptr, size_t size);
+void  free(void *ptr);
+
+#endif /* MALLOC_PREFIX */
+
+/* You can redefine av_malloc and av_free in your project to use your

    memory allocator. You do not need to suppress this file because the
    memory allocator. You do not need to suppress this file because the

-   linker will do it automatically */
+   linker will do it automatically. */

 
 

-void *av_malloc(unsigned int size)
+void *av_malloc(size_t size)

 {
     void *ptr = NULL;
 #if CONFIG_MEMALIGN_HACK
     long diff;
 #endif
 
 {
     void *ptr = NULL;
 #if CONFIG_MEMALIGN_HACK
     long diff;
 #endif
 

+    assert(size);
+

     /* let's disallow possible ambiguous cases */
     /* let's disallow possible ambiguous cases */

-    if(size > (INT_MAX-16) )
+    if (size > (INT_MAX-32) || !size)

         return NULL;
 
 #if CONFIG_MEMALIGN_HACK
         return NULL;
 
 #if CONFIG_MEMALIGN_HACK

-    ptr = malloc(size+16);
+    ptr = malloc(size+32);

     if(!ptr)
         return ptr;
     if(!ptr)
         return ptr;

-    diff= ((-(long)ptr - 1)&15) + 1;
+    diff= ((-(long)ptr - 1)&31) + 1;

     ptr = (char*)ptr + diff;
     ((char*)ptr)[-1]= diff;
 #elif HAVE_POSIX_MEMALIGN
     ptr = (char*)ptr + diff;
     ((char*)ptr)[-1]= diff;
 #elif HAVE_POSIX_MEMALIGN

-    posix_memalign(&ptr,16,size);
+    if (posix_memalign(&ptr,32,size))
+        ptr = NULL;

 #elif HAVE_MEMALIGN
 #elif HAVE_MEMALIGN

-    ptr = memalign(16,size);
+    ptr = memalign(32,size);

     /* Why 64?
        Indeed, we should align it:
          on 4 for 386
          on 16 for 486
     /* Why 64?
        Indeed, we should align it:
          on 4 for 386
          on 16 for 486

-         on 32 for 586, PPro - k6-III
+         on 32 for 586, PPro - K6-III

          on 64 for K7 (maybe for P3 too).
        Because L1 and L2 caches are aligned on those values.
        But I don't want to code such logic here!
      */
          on 64 for K7 (maybe for P3 too).
        Because L1 and L2 caches are aligned on those values.
        But I don't want to code such logic here!
      */

-     /* Why 16?
-        Because some CPUs need alignment, for example SSE2 on P4, & most RISC CPUs
-        it will just trigger an exception and the unaligned load will be done in the
-        exception handler or it will just segfault (SSE2 on P4)
+     /* Why 32?
+        For AVX ASM. SSE / NEON needs only 16.

         Why not larger? Because I did not see a difference in benchmarks ...
      */
         Why not larger? Because I did not see a difference in benchmarks ...
      */

-     /* benchmarks with p3
+     /* benchmarks with P3

         memalign(64)+1          3071,3051,3032
         memalign(64)+2          3051,3032,3041
         memalign(64)+4          2911,2896,2915
         memalign(64)+1          3071,3051,3032
         memalign(64)+2          3051,3032,3041
         memalign(64)+4          2911,2896,2915


@@ -90,7 +108,7 @@ void *av_malloc(unsigned int size)
         memalign(64)+32         2546,2545,2571
         memalign(64)+64         2570,2533,2558
 
         memalign(64)+32         2546,2545,2571
         memalign(64)+64         2570,2533,2558
 

-        btw, malloc seems to do 8 byte alignment by default here
+        BTW, malloc seems to do 8-byte alignment by default here.

      */
 #else
     ptr = malloc(size);
      */
 #else
     ptr = malloc(size);


@@ -98,7 +116,7 @@ void *av_malloc(unsigned int size)
     return ptr;
 }
 
     return ptr;
 }
 

-void *av_realloc(void *ptr, unsigned int size)
+void *av_realloc(void *ptr, size_t size)

 {
 #if CONFIG_MEMALIGN_HACK
     int diff;
 {
 #if CONFIG_MEMALIGN_HACK
     int diff;


@@ -120,12 +138,11 @@ void *av_realloc(void *ptr, unsigned int size)
 
 void av_free(void *ptr)
 {
 
 void av_free(void *ptr)
 {

-    /* XXX: this test should not be needed on most libcs */
-    if (ptr)

 #if CONFIG_MEMALIGN_HACK
 #if CONFIG_MEMALIGN_HACK

+    if (ptr)

         free((char*)ptr - ((char*)ptr)[-1]);
 #else
         free((char*)ptr - ((char*)ptr)[-1]);
 #else

-        free(ptr);
+    free(ptr);

 #endif
 }
 
 #endif
 }
 


@@ -136,7 +153,7 @@ void av_freep(void *arg)
     *ptr = NULL;
 }
 
     *ptr = NULL;
 }
 

-void *av_mallocz(unsigned int size)
+void *av_mallocz(size_t size)

 {
     void *ptr = av_malloc(size);
     if (ptr)
 {
     void *ptr = av_malloc(size);
     if (ptr)


@@ -155,4 +172,3 @@ char *av_strdup(const char *s)
     }
     return ptr;
 }
     }
     return ptr;
 }

-