From 703318b350247ca629461a40ee0eb96c9922c463 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 7 May 2022 05:16:44 +0200 Subject: [PATCH] avformat/utils: Move freeing AVFormatContext to a new file avformat.c This file will contain the AVFormatContext-specific parts that are used by both demuxers and muxers. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 1 + libavformat/avformat.c | 130 +++++++++++++++++++++++++++++++++++++++++ libavformat/utils.c | 104 --------------------------------- 3 files changed, 131 insertions(+), 104 deletions(-) create mode 100644 libavformat/avformat.c diff --git a/libavformat/Makefile b/libavformat/Makefile index a03fd7f256..7fd6d099b9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -7,6 +7,7 @@ HEADERS = avformat.h \ version_major.h \ OBJS = allformats.o \ + avformat.o \ avio.o \ aviobuf.o \ demux.o \ diff --git a/libavformat/avformat.c b/libavformat/avformat.c new file mode 100644 index 0000000000..88acae018e --- /dev/null +++ b/libavformat/avformat.c @@ -0,0 +1,130 @@ +/* + * Various functions used by both muxers and demuxers + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * + * 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 + */ + +#include "libavutil/avassert.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/bsf.h" +#include "libavcodec/packet_internal.h" +#include "avformat.h" +#include "demux.h" +#include "internal.h" + +void ff_free_stream(AVStream **pst) +{ + AVStream *st = *pst; + FFStream *const sti = ffstream(st); + + if (!st) + return; + + for (int i = 0; i < st->nb_side_data; i++) + av_freep(&st->side_data[i].data); + av_freep(&st->side_data); + + if (st->attached_pic.data) + av_packet_unref(&st->attached_pic); + + av_parser_close(sti->parser); + avcodec_free_context(&sti->avctx); + av_bsf_free(&sti->bsfc); + av_freep(&sti->priv_pts); + av_freep(&sti->index_entries); + av_freep(&sti->probe_data.buf); + + av_bsf_free(&sti->extract_extradata.bsf); + + if (sti->info) { + av_freep(&sti->info->duration_error); + av_freep(&sti->info); + } + + av_dict_free(&st->metadata); + avcodec_parameters_free(&st->codecpar); + av_freep(&st->priv_data); + + av_freep(pst); +} + +void ff_remove_stream(AVFormatContext *s, AVStream *st) +{ + av_assert0(s->nb_streams>0); + av_assert0(s->streams[ s->nb_streams - 1 ] == st); + + ff_free_stream(&s->streams[ --s->nb_streams ]); +} + +/* XXX: suppress the packet queue */ +void ff_flush_packet_queue(AVFormatContext *s) +{ + FFFormatContext *const si = ffformatcontext(s); + avpriv_packet_list_free(&si->parse_queue); + avpriv_packet_list_free(&si->packet_buffer); + avpriv_packet_list_free(&si->raw_packet_buffer); + + si->raw_packet_buffer_size = 0; +} + +void avformat_free_context(AVFormatContext *s) +{ + FFFormatContext *si; + + if (!s) + return; + si = ffformatcontext(s); + + if (s->oformat && s->oformat->deinit && si->initialized) + s->oformat->deinit(s); + + av_opt_free(s); + if (s->iformat && s->iformat->priv_class && s->priv_data) + av_opt_free(s->priv_data); + if (s->oformat && s->oformat->priv_class && s->priv_data) + av_opt_free(s->priv_data); + + for (unsigned i = 0; i < s->nb_streams; i++) + ff_free_stream(&s->streams[i]); + s->nb_streams = 0; + + for (unsigned i = 0; i < s->nb_programs; i++) { + av_dict_free(&s->programs[i]->metadata); + av_freep(&s->programs[i]->stream_index); + av_freep(&s->programs[i]); + } + s->nb_programs = 0; + + av_freep(&s->programs); + av_freep(&s->priv_data); + while (s->nb_chapters--) { + av_dict_free(&s->chapters[s->nb_chapters]->metadata); + av_freep(&s->chapters[s->nb_chapters]); + } + av_freep(&s->chapters); + av_dict_free(&s->metadata); + av_dict_free(&si->id3v2_meta); + av_packet_free(&si->pkt); + av_packet_free(&si->parse_pkt); + av_freep(&s->streams); + ff_flush_packet_queue(s); + av_freep(&s->url); + av_free(s); +} diff --git a/libavformat/utils.c b/libavformat/utils.c index 06401b767c..b3806fe87b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -29,18 +29,14 @@ #include "libavutil/dict.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/opt.h" #include "libavutil/pixfmt.h" #include "libavutil/thread.h" #include "libavutil/time.h" -#include "libavcodec/bsf.h" #include "libavcodec/internal.h" -#include "libavcodec/packet_internal.h" #include "avformat.h" #include "avio_internal.h" -#include "demux.h" #include "internal.h" #if CONFIG_NETWORK #include "network.h" @@ -188,17 +184,6 @@ int ff_is_intra_only(enum AVCodecID id) return 1; } -/* XXX: suppress the packet queue */ -void ff_flush_packet_queue(AVFormatContext *s) -{ - FFFormatContext *const si = ffformatcontext(s); - avpriv_packet_list_free(&si->parse_queue); - avpriv_packet_list_free(&si->packet_buffer); - avpriv_packet_list_free(&si->raw_packet_buffer); - - si->raw_packet_buffer_size = 0; -} - int av_find_default_stream_index(AVFormatContext *s) { int best_stream = 0; @@ -472,95 +457,6 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) return 0; } -void ff_free_stream(AVStream **pst) -{ - AVStream *st = *pst; - FFStream *const sti = ffstream(st); - - if (!st) - return; - - for (int i = 0; i < st->nb_side_data; i++) - av_freep(&st->side_data[i].data); - av_freep(&st->side_data); - - if (st->attached_pic.data) - av_packet_unref(&st->attached_pic); - - av_parser_close(sti->parser); - avcodec_free_context(&sti->avctx); - av_bsf_free(&sti->bsfc); - av_freep(&sti->priv_pts); - av_freep(&sti->index_entries); - av_freep(&sti->probe_data.buf); - - av_bsf_free(&sti->extract_extradata.bsf); - - if (sti->info) { - av_freep(&sti->info->duration_error); - av_freep(&sti->info); - } - - av_dict_free(&st->metadata); - avcodec_parameters_free(&st->codecpar); - av_freep(&st->priv_data); - - av_freep(pst); -} - -void ff_remove_stream(AVFormatContext *s, AVStream *st) -{ - av_assert0(s->nb_streams>0); - av_assert0(s->streams[ s->nb_streams - 1 ] == st); - - ff_free_stream(&s->streams[ --s->nb_streams ]); -} - -void avformat_free_context(AVFormatContext *s) -{ - FFFormatContext *si; - - if (!s) - return; - si = ffformatcontext(s); - - if (s->oformat && s->oformat->deinit && si->initialized) - s->oformat->deinit(s); - - av_opt_free(s); - if (s->iformat && s->iformat->priv_class && s->priv_data) - av_opt_free(s->priv_data); - if (s->oformat && s->oformat->priv_class && s->priv_data) - av_opt_free(s->priv_data); - - for (unsigned i = 0; i < s->nb_streams; i++) - ff_free_stream(&s->streams[i]); - s->nb_streams = 0; - - for (unsigned i = 0; i < s->nb_programs; i++) { - av_dict_free(&s->programs[i]->metadata); - av_freep(&s->programs[i]->stream_index); - av_freep(&s->programs[i]); - } - s->nb_programs = 0; - - av_freep(&s->programs); - av_freep(&s->priv_data); - while (s->nb_chapters--) { - av_dict_free(&s->chapters[s->nb_chapters]->metadata); - av_freep(&s->chapters[s->nb_chapters]); - } - av_freep(&s->chapters); - av_dict_free(&s->metadata); - av_dict_free(&si->id3v2_meta); - av_packet_free(&si->pkt); - av_packet_free(&si->parse_pkt); - av_freep(&s->streams); - ff_flush_packet_queue(s); - av_freep(&s->url); - av_free(s); -} - AVProgram *av_new_program(AVFormatContext *ac, int id) { AVProgram *program = NULL;