i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: avcodec_free_context seems to also free extradata

Browse Source 
* context->extradata seems to be set to fExtraData or fInputFormat.MetaData().
Both are managed by us, so set context->extradata to NULL before freeing.
* avcodec_close() shouldn't use according to the documentation:
"Use avcodec_free_context() to destroy a codec context (either open or closed).
Opening and closing a codec context multiple times is not supported anymore – use multiple codec contexts instead."
* fix #18713

Change-Id: I820deefcffea52a39fcb7587153d40dc03c85024
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7208
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Jérôme Duval
2023-12-15 07:55:38 +00:00
committed by Adrien Destugues
parent b5ba4badb3
commit e691cf1eed
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
+11 -21
View File
@@ -147,9 +147,6 @@ AVCodecDecoder::~AVCodecDecoder()
} }
#endif #endif
if (fCodecInitDone)
avcodec_close(fCodecContext);
swr_free(&fResampleContext); swr_free(&fResampleContext);
free(fChunkBuffer); free(fChunkBuffer);
free(fDecodedData); free(fDecodedData);
@@ -158,6 +155,7 @@ AVCodecDecoder::~AVCodecDecoder()
av_frame_free(&fRawDecodedPicture); av_frame_free(&fRawDecodedPicture);
av_free(fRawDecodedAudio->opaque); av_free(fRawDecodedAudio->opaque);
av_frame_free(&fRawDecodedAudio); av_frame_free(&fRawDecodedAudio);
fCodecContext->extradata = NULL;
avcodec_free_context(&fCodecContext); avcodec_free_context(&fCodecContext);
av_frame_free(&fDecodedDataBuffer); av_frame_free(&fDecodedDataBuffer);
@@ -301,6 +299,12 @@ AVCodecDecoder::NegotiateOutputFormat(media_format* inOutFormat)
TRACE(" [%c] requested format = %s\n", fIsAudio?('a'):('v'), buffer); TRACE(" [%c] requested format = %s\n", fIsAudio?('a'):('v'), buffer);
#endif #endif
// close any previous instance
fCodecContext->extradata = NULL;
avcodec_free_context(&fCodecContext);
fCodecContext = avcodec_alloc_context3(fCodec);
fCodecInitDone = false;
if (fIsAudio) if (fIsAudio)
return _NegotiateAudioOutputFormat(inOutFormat); return _NegotiateAudioOutputFormat(inOutFormat);
else else
@@ -350,18 +354,11 @@ AVCodecDecoder::_NegotiateAudioOutputFormat(media_format* inOutFormat)
// to _DecodeNextAudioFrameChunk() will update the essential audio // to _DecodeNextAudioFrameChunk() will update the essential audio
// format properties accordingly regardless of the settings here. // format properties accordingly regardless of the settings here.
// close any previous instance if (avcodec_open2(fCodecContext, fCodec, NULL) < 0) {
if (fCodecInitDone) {
fCodecInitDone = false;
avcodec_close(fCodecContext);
}
if (avcodec_open2(fCodecContext, fCodec, NULL) >= 0)
fCodecInitDone = true;
else {
TRACE("avcodec_open() failed to init codec!\n"); TRACE("avcodec_open() failed to init codec!\n");
return B_ERROR; return B_ERROR;
} }
fCodecInitDone = true;
free(fChunkBuffer); free(fChunkBuffer);
fChunkBuffer = NULL; fChunkBuffer = NULL;
@@ -464,18 +461,11 @@ AVCodecDecoder::_NegotiateVideoOutputFormat(media_format* inOutFormat)
fCodecContext->flags |= AV_CODEC_FLAG_TRUNCATED; fCodecContext->flags |= AV_CODEC_FLAG_TRUNCATED;
} }
// close any previous instance if (avcodec_open2(fCodecContext, fCodec, NULL) < 0) {
if (fCodecInitDone) {
fCodecInitDone = false;
avcodec_close(fCodecContext);
}
if (avcodec_open2(fCodecContext, fCodec, NULL) >= 0)
fCodecInitDone = true;
else {
TRACE("avcodec_open() failed to init codec!\n"); TRACE("avcodec_open() failed to init codec!\n");
return B_ERROR; return B_ERROR;
} }
fCodecInitDone = true;
#if USE_SWS_FOR_COLOR_SPACE_CONVERSION #if USE_SWS_FOR_COLOR_SPACE_CONVERSION
fOutputColorSpace = B_RGB32; fOutputColorSpace = B_RGB32;