LAV
/
FFmpeg
1
0
Fork 0
Code

avformat/mov: split off MOVStreamContext freeing into its own function 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-01-31 15:39:20 -03:00
parent 78a7927df7
commit 0042cf8980
1 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
libavformat/mov.c
View File

@ -8587,6 +8587,58 @@ static void mov_free_encryption_index(MOVEncryptionIndex **index) {
av_freep(index);
}
static void mov_free_stream_context(AVFormatContext *s, AVStream *st)
{
MOVStreamContext *sc = st->priv_data;
if (!sc)
return;
av_freep(&sc->ctts_data);
for (int i = 0; i < sc->drefs_count; i++) {
av_freep(&sc->drefs[i].path);
av_freep(&sc->drefs[i].dir);
}
av_freep(&sc->drefs);
sc->drefs_count = 0;
if (!sc->pb_is_copied)
ff_format_io_close(s, &sc->pb);
sc->pb = NULL;
av_freep(&sc->chunk_offsets);
av_freep(&sc->stsc_data);
av_freep(&sc->sample_sizes);
av_freep(&sc->keyframes);
av_freep(&sc->stts_data);
av_freep(&sc->sdtp_data);
av_freep(&sc->stps_data);
av_freep(&sc->elst_data);
av_freep(&sc->rap_group);
av_freep(&sc->sync_group);
av_freep(&sc->sgpd_sync);
av_freep(&sc->sample_offsets);
av_freep(&sc->open_key_samples);
av_freep(&sc->display_matrix);
av_freep(&sc->index_ranges);
if (sc->extradata)
for (int i = 0; i < sc->stsd_count; i++)
av_free(sc->extradata[i]);
av_freep(&sc->extradata);
av_freep(&sc->extradata_size);
mov_free_encryption_index(&sc->cenc.encryption_index);
av_encryption_info_free(sc->cenc.default_encrypted_sample);
av_aes_ctr_free(sc->cenc.aes_ctr);
av_freep(&sc->stereo3d);
av_freep(&sc->spherical);
av_freep(&sc->mastering);
av_freep(&sc->coll);
}
static int mov_read_close(AVFormatContext *s)
{
MOVContext *mov = s->priv_data;
@ -8594,54 +8646,8 @@ static int mov_read_close(AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MOVStreamContext *sc = st->priv_data;
if (!sc)
continue;
av_freep(&sc->ctts_data);
for (j = 0; j < sc->drefs_count; j++) {
av_freep(&sc->drefs[j].path);
av_freep(&sc->drefs[j].dir);
}
av_freep(&sc->drefs);
sc->drefs_count = 0;
if (!sc->pb_is_copied)
ff_format_io_close(s, &sc->pb);
sc->pb = NULL;
av_freep(&sc->chunk_offsets);
av_freep(&sc->stsc_data);
av_freep(&sc->sample_sizes);
av_freep(&sc->keyframes);
av_freep(&sc->stts_data);
av_freep(&sc->sdtp_data);
av_freep(&sc->stps_data);
av_freep(&sc->elst_data);
av_freep(&sc->rap_group);
av_freep(&sc->sync_group);
av_freep(&sc->sgpd_sync);
av_freep(&sc->sample_offsets);
av_freep(&sc->open_key_samples);
av_freep(&sc->display_matrix);
av_freep(&sc->index_ranges);
if (sc->extradata)
for (j = 0; j < sc->stsd_count; j++)
av_free(sc->extradata[j]);
av_freep(&sc->extradata);
av_freep(&sc->extradata_size);
mov_free_encryption_index(&sc->cenc.encryption_index);
av_encryption_info_free(sc->cenc.default_encrypted_sample);
av_aes_ctr_free(sc->cenc.aes_ctr);
av_freep(&sc->stereo3d);
av_freep(&sc->spherical);
av_freep(&sc->mastering);
av_freep(&sc->coll);
mov_free_stream_context(s, st);
}
av_freep(&mov->dv_demux);