mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-12-13 22:58:40 +00:00
6db8cd8f37
* commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83':
lavu: fix memory leaks by using a mutex instead of atomics
Conflicts:
libavutil/buffer.c
The atomics code is left in place as a fallback for synchronization in the
absence of p/w32 threads. Our ABI did not requires applications to
only use threads (and matching ones) to what libavutil was build with
Our code also was not affected by the leak this change fixes, though
no question the atomics based implementation is not pretty at all.
First and foremost the code must work, being pretty comes after that.
If this causes problems, for example when libavutil is used by multiple
applications each using a different kind of threading system then the
default possibly has to be changed to the uglier atomics.
See: cea3a63ba3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
97 lines
2.6 KiB
C
97 lines
2.6 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg 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.
|
|
*
|
|
* FFmpeg 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
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVUTIL_BUFFER_INTERNAL_H
|
|
#define AVUTIL_BUFFER_INTERNAL_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "buffer.h"
|
|
#include "thread.h"
|
|
|
|
/**
|
|
* The buffer is always treated as read-only.
|
|
*/
|
|
#define BUFFER_FLAG_READONLY (1 << 0)
|
|
/**
|
|
* The buffer was av_realloc()ed, so it is reallocatable.
|
|
*/
|
|
#define BUFFER_FLAG_REALLOCATABLE (1 << 1)
|
|
|
|
struct AVBuffer {
|
|
uint8_t *data; /**< data described by this buffer */
|
|
int size; /**< size of data in bytes */
|
|
|
|
/**
|
|
* number of existing AVBufferRef instances referring to this buffer
|
|
*/
|
|
volatile int refcount;
|
|
|
|
/**
|
|
* a callback for freeing the data
|
|
*/
|
|
void (*free)(void *opaque, uint8_t *data);
|
|
|
|
/**
|
|
* an opaque pointer, to be used by the freeing callback
|
|
*/
|
|
void *opaque;
|
|
|
|
/**
|
|
* A combination of BUFFER_FLAG_*
|
|
*/
|
|
int flags;
|
|
};
|
|
|
|
typedef struct BufferPoolEntry {
|
|
uint8_t *data;
|
|
|
|
/*
|
|
* Backups of the original opaque/free of the AVBuffer corresponding to
|
|
* data. They will be used to free the buffer when the pool is freed.
|
|
*/
|
|
void *opaque;
|
|
void (*free)(void *opaque, uint8_t *data);
|
|
|
|
AVBufferPool *pool;
|
|
struct BufferPoolEntry *next;
|
|
} BufferPoolEntry;
|
|
|
|
struct AVBufferPool {
|
|
AVMutex mutex;
|
|
BufferPoolEntry *pool;
|
|
|
|
/*
|
|
* This is used to track when the pool is to be freed.
|
|
* The pointer to the pool itself held by the caller is considered to
|
|
* be one reference. Each buffer requested by the caller increases refcount
|
|
* by one, returning the buffer to the pool decreases it by one.
|
|
* refcount reaches zero when the buffer has been uninited AND all the
|
|
* buffers have been released, then it's safe to free the pool and all
|
|
* the buffers in it.
|
|
*/
|
|
volatile int refcount;
|
|
|
|
volatile int nb_allocated;
|
|
|
|
int size;
|
|
AVBufferRef* (*alloc)(int size);
|
|
};
|
|
|
|
#endif /* AVUTIL_BUFFER_INTERNAL_H */
|