mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

FFmpegSource2: fix indexing memory leak

Browse source 
Originally committed to SVN as r2409.
This commit is contained in:
Fredrik Mellbin 2008-10-02 18:04:22 +00:00
parent fd8a7750c7
commit 443d57e5c2
1 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
FFmpegSource2/indexing.cpp
View file

@ -66,9 +66,8 @@ public:
~FFAudioContext() { ~FFAudioContext() {
delete W64W; delete W64W;
// FIXME, why is there an access violation here? if (CTX)
// if (CTX) avcodec_close(CTX);
// avcodec_close(CTX);
} }
}; };
@ -76,17 +75,23 @@ class MatroskaIndexMemory {
private: private:
int16_t *DecodingBuffer; int16_t *DecodingBuffer;
MatroskaAudioContext *AudioContexts; MatroskaAudioContext *AudioContexts;
MatroskaFile *MF;
MatroskaReaderContext *MC;
public: public:
MatroskaIndexMemory(int Tracks, int16_t *&DecodingBuffer, MatroskaAudioContext *&AudioContexts) { MatroskaIndexMemory(int Tracks, int16_t *&DecodingBuffer, MatroskaAudioContext *&AudioContexts, MatroskaFile *MF, MatroskaReaderContext *MC) {
DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10]; DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10];
AudioContexts = new MatroskaAudioContext[Tracks]; AudioContexts = new MatroskaAudioContext[Tracks];
this->DecodingBuffer = DecodingBuffer; this->DecodingBuffer = DecodingBuffer;
this->AudioContexts = AudioContexts; this->AudioContexts = AudioContexts;
this->MF = MF;
this->MC = MC;
} }
~MatroskaIndexMemory() { ~MatroskaIndexMemory() {
delete [] DecodingBuffer; delete [] DecodingBuffer;
delete [] AudioContexts; delete [] AudioContexts;
mkv_Close(MF);
fclose(MC->ST.fp);
} }
}; };
@ -94,33 +99,20 @@ class FFIndexMemory {
private: private:
int16_t *DecodingBuffer; int16_t *DecodingBuffer;
FFAudioContext *AudioContexts; FFAudioContext *AudioContexts;
AVFormatContext *FormatContext;
public: public:
FFIndexMemory(int Tracks, int16_t *&DecodingBuffer, FFAudioContext *&AudioContexts) { FFIndexMemory(int Tracks, int16_t *&DecodingBuffer, FFAudioContext *&AudioContexts, AVFormatContext *&FormatContext) {
DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10]; DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10];
AudioContexts = new FFAudioContext[Tracks]; AudioContexts = new FFAudioContext[Tracks];
this->DecodingBuffer = DecodingBuffer; this->DecodingBuffer = DecodingBuffer;
this->AudioContexts = AudioContexts; this->AudioContexts = AudioContexts;
this->FormatContext = FormatContext;
} }
~FFIndexMemory() { ~FFIndexMemory() {
delete [] DecodingBuffer; delete [] DecodingBuffer;
delete [] AudioContexts; delete [] AudioContexts;
} av_close_input_file(FormatContext);
};
class MatroskaMemory {
private:
MatroskaFile *MF;
MatroskaReaderContext *MC;
public:
MatroskaMemory(MatroskaFile *MF, MatroskaReaderContext *MC) {
this->MF = MF;
this->MC = MC;
}
~MatroskaMemory() {
mkv_Close(MF);
fclose(MC->ST.fp);
} }
}; };
@ -189,13 +181,11 @@ static FrameIndex *MakeMatroskaIndex(const char *SourceFile, int IndexMask, int
return NULL; return NULL;
} }
MatroskaMemory MM = MatroskaMemory(MF, &MC);
// Audio stuff // Audio stuff
int16_t *db; int16_t *db;
MatroskaAudioContext *AudioContexts; MatroskaAudioContext *AudioContexts;
MatroskaIndexMemory IM = MatroskaIndexMemory(mkv_GetNumTracks(MF), db, AudioContexts); MatroskaIndexMemory IM = MatroskaIndexMemory(mkv_GetNumTracks(MF), db, AudioContexts, MF, &MC);
for (unsigned int i = 0; i < mkv_GetNumTracks(MF); i++) { for (unsigned int i = 0; i < mkv_GetNumTracks(MF); i++) {
if (IndexMask & (1 << i) && mkv_GetTrackInfo(MF, i)->Type == TT_AUDIO) { if (IndexMask & (1 << i) && mkv_GetTrackInfo(MF, i)->Type == TT_AUDIO) {
@ -341,7 +331,7 @@ FrameIndex *MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const
int16_t *db; int16_t *db;
FFAudioContext *AudioContexts; FFAudioContext *AudioContexts;
FFIndexMemory IM = FFIndexMemory(FormatContext->nb_streams, db, AudioContexts); FFIndexMemory IM = FFIndexMemory(FormatContext->nb_streams, db, AudioContexts, FormatContext);
for (unsigned int i = 0; i < FormatContext->nb_streams; i++) { for (unsigned int i = 0; i < FormatContext->nb_streams; i++) {
if (IndexMask & (1 << i) && FormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { if (IndexMask & (1 << i) && FormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) {
@ -439,8 +429,6 @@ FrameIndex *MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const
av_free_packet(&Packet); av_free_packet(&Packet);
} }
av_close_input_file(FormatContext);
SortTrackIndices(TrackIndices); SortTrackIndices(TrackIndices);
return TrackIndices; return TrackIndices;
} }