[FFmpeg-devel] [PATCH 2/8] avformat/flvenc: Add deinit function

[Steven Liu]

Andreas Rheinhardt <andreas.rheinhardt at outlook.com> 于2022年7月6日周三 04:27写道：
>
> Fixes memleaks when the trailer is never written or when shift_data()
> fails when writing the trailer.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> This is the same as
> https://patchwork.ffmpeg.org/project/ffmpeg/patch/20191023125944.10292-4-andreas.rheinhardt@gmail.com/
>
>  libavformat/flvenc.c | 30 ++++++++++++++++--------------
>  1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
> index 4e65ba4066..b6135b25bf 100644
> --- a/libavformat/flvenc.c
> +++ b/libavformat/flvenc.c
> @@ -733,7 +733,7 @@ static int flv_write_trailer(AVFormatContext *s)
>      int64_t cur_pos = avio_tell(s->pb);
>
>      if (build_keyframes_idx) {
> -        FLVFileposition *newflv_posinfo, *p;
> +        FLVFileposition *newflv_posinfo;
>
>          avio_seek(pb, flv->videosize_offset, SEEK_SET);
>          put_amf_double(pb, flv->videosize);
> @@ -768,19 +768,6 @@ static int flv_write_trailer(AVFormatContext *s)
>              put_amf_double(pb, newflv_posinfo->keyframe_timestamp);
>          }
>
> -        newflv_posinfo = flv->head_filepositions;
> -        while (newflv_posinfo) {
> -            p = newflv_posinfo->next;
> -            if (p) {
> -                newflv_posinfo->next = p->next;
> -                av_free(p);
> -                p = NULL;
> -            } else {
> -                av_free(newflv_posinfo);
> -                newflv_posinfo = NULL;
> -            }
> -        }
> -
>          put_amf_string(pb, "");
>          avio_w8(pb, AMF_END_OF_OBJECT);
>
> @@ -1047,6 +1034,20 @@ static int flv_check_bitstream(AVFormatContext *s, AVStream *st,
>      return ret;
>  }
>
> +static void flv_deinit(AVFormatContext *s)
> +{
> +    FLVContext *flv = s->priv_data;
> +    FLVFileposition *filepos = flv->head_filepositions;
> +
> +    while (filepos) {
> +        FLVFileposition *next = filepos->next;
> +        av_free(filepos);
> +        filepos = next;
> +    }
> +    flv->filepositions = flv->head_filepositions = NULL;
> +    flv->filepositions_count = 0;
> +}
> +
>  static const AVOption options[] = {
>      { "flvflags", "FLV muxer flags", offsetof(FLVContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
>      { "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
> @@ -1076,6 +1077,7 @@ const AVOutputFormat ff_flv_muxer = {
>      .write_header   = flv_write_header,
>      .write_packet   = flv_write_packet,
>      .write_trailer  = flv_write_trailer,
> +    .deinit         = flv_deinit,
>      .check_bitstream= flv_check_bitstream,
>      .codec_tag      = (const AVCodecTag* const []) {
>                            flv_video_codec_ids, flv_audio_codec_ids, 0
> --
> 2.34.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".

 The flvenc part patchset looks ok to me.


Thanks
Steven