mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffmpegdec.cpp fix memleak

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-01-05 14:57:42 +01:00
parent 2d5a1c9e29
commit 30dbfb7ec9
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/driver/audiodec/ffmpegdec.cpp
View File

@@ -84,6 +84,8 @@ CFfmpegDec::CFfmpegDec(void)
buffer_size = 0x1000; buffer_size = 0x1000;
buffer = NULL; buffer = NULL;
avc = NULL; avc = NULL;
c = NULL;//codec
avioc = NULL;
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
avcodec_register_all(); avcodec_register_all();
av_register_all(); av_register_all();
@@ -139,7 +141,6 @@ bool CFfmpegDec::Init(void *_in, const CFile::FileType /* ft */)
av_log_set_level(AV_LOG_INFO); av_log_set_level(AV_LOG_INFO);
#endif #endif
AVIOContext *avioc = NULL;
in = _in; in = _in;
is_stream = fseek((FILE *)in, 0, SEEK_SET); is_stream = fseek((FILE *)in, 0, SEEK_SET);
buffer = (unsigned char *) av_malloc(buffer_size); buffer = (unsigned char *) av_malloc(buffer_size);
@@ -193,17 +194,7 @@ bool CFfmpegDec::Init(void *_in, const CFile::FileType /* ft */)
if (r) { if (r) {
char buf[200]; av_strerror(r, buf, sizeof(buf)); char buf[200]; av_strerror(r, buf, sizeof(buf));
fprintf(stderr, "%d %s %d: %s\n", __LINE__, __func__,r,buf); fprintf(stderr, "%d %s %d: %s\n", __LINE__, __func__,r,buf);
if (avioc) DeInit();
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100))
av_free(avioc);
#else
avio_context_free(&avioc);
#endif
if (avc) {
avformat_close_input(&avc);
avformat_free_context(avc);
avc = NULL;
}
return false; return false;
} }
return true; return true;
@@ -211,13 +202,26 @@ bool CFfmpegDec::Init(void *_in, const CFile::FileType /* ft */)
void CFfmpegDec::DeInit(void) void CFfmpegDec::DeInit(void)
{ {
if (avc) { if(c)
if (avc->pb) {
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100)) #if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100))
av_free(avc->pb); avcodec_close(c);
#else #else
avio_context_free(&avc->pb); avcodec_free_context(&c);
#endif #endif
c = NULL;
}
if (avioc)
{
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100))
av_free(avioc);
#else
av_freep(&avioc->buffer);
avio_context_free(&avioc);
#endif
}
if(avc)
{
avformat_close_input(&avc); avformat_close_input(&avc);
avformat_free_context(avc); avformat_free_context(avc);
avc = NULL; avc = NULL;
@@ -237,14 +241,14 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
return Status; return Status;
} }
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) #if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ))
AVCodecContext *c = avc->streams[best_stream]->codec; c = avc->streams[best_stream]->codec;
#else #else
AVCodecContext *c = avcodec_alloc_context3(codec); c = avcodec_alloc_context3(codec);
if(avcodec_parameters_to_context(c,avc->streams[best_stream]->codecpar) < 0){ if(avcodec_parameters_to_context(c,avc->streams[best_stream]->codecpar) < 0){
DeInit(); DeInit();
Status=DATA_ERR; Status=DATA_ERR;
return Status; return Status;
} }
#endif #endif
mutex.lock(); mutex.lock();
int r = avcodec_open2(c, codec, NULL); int r = avcodec_open2(c, codec, NULL);
@@ -433,8 +437,6 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
av_free(outbuf); av_free(outbuf);
av_packet_unref(&rpacket); av_packet_unref(&rpacket);
av_frame_free(&frame); av_frame_free(&frame);
avcodec_close(c);
//av_free(avcc);
DeInit(); DeInit();
if (_meta_data->cover_temporary && !_meta_data->cover.empty()) { if (_meta_data->cover_temporary && !_meta_data->cover.empty()) {

2
src/driver/audiodec/ffmpegdec.h
View File

@@ -55,6 +55,8 @@ private:
unsigned char *buffer; unsigned char *buffer;
AVFormatContext *avc; AVFormatContext *avc;
AVCodec *codec; AVCodec *codec;
AVCodecContext *c;
AVIOContext *avioc;
int best_stream; int best_stream;
void *in; void *in;
bool Init(void *_in, const CFile::FileType ft); bool Init(void *_in, const CFile::FileType ft);