From patchwork Fri Mar 5 16:33:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26131 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1624044B9E2 for ; Fri, 5 Mar 2021 18:35:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF4C368AC11; Fri, 5 Mar 2021 18:35:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 087D668AB82 for ; Fri, 5 Mar 2021 18:35:47 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id h7so1286689qvm.2 for ; Fri, 05 Mar 2021 08:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=x+sRhAbd6EvfwnhSWVTvdyw4K1dMoAIfHmwWaw8+ptI=; b=cznKWeOuBr42pky/nWfMgHefyu4W09sWjpMA9CLQZPAOM0FKKBqHQwctFJFqfUKHbl DjNiRAEXmV192r79K8wmeeDOxXoFHHXpWRYKVPiATwtVpbpjKMPwj0DzvUfXBQSgeIZ/ xqHx+1dh9Wn8DdDX+/N7bfH38Dt6J0s+cDDwFLCuzB4pYBXWEfJ908rlcgCzoNIdKAqV +l7FNK5hVr8yFzrFEtLO0P2sko6A2zOkNvxXWLdw075ouSHtTHDf+lgQglFROc91AROR fj5wpQnmd/pb6d5Dlkb9jhNJHWD3JUsg9wS427UG/FYmm6lh1zjF7rMnktnAWD3Ym/em 5Lkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x+sRhAbd6EvfwnhSWVTvdyw4K1dMoAIfHmwWaw8+ptI=; b=OItZ4OLffMkklvVR7EPenmy2raKbHKqXFTFyFp4zDutd4Ioj7NxWqMXhj8hB24Ityy fJjXS4wyzozLuq15NNhadNOExbwWgC4h87w20m1zybH/LFz997aE8f7BsVFvEUQl7jQu D+qYUv3y32yhEfz3X5ZJvB93LrhwBF0syUNfPuNFB0CyZcew00X4/aEeVmEXPDghydyO j48KH9p7gW3l6Um18zzo04vz0mjalOmZkRezTD79sU/EIu4zVmlUH2rucyMtsQfWAZoX gZUsCQMmKD2YGznjd1Ns9NnUSA4zO9XyK26u55jBLD0o7Stv3AB1fJrculsDl+TUf5v4 QNOw== X-Gm-Message-State: AOAM533g/fKPuO/m4tBY6mDvwk7r65Q7BxZZfsvdJ/0LTr3QmpSJtDgx /wSNCGTTql/m2BABmHnlhKdZdKydM3+3lQ== X-Google-Smtp-Source: ABdhPJwTrEgbioh8AoWXds5YYEtKJngyclJUtJDJXZuaUn7bJij132xHAk6nQOVdD2FEfg57MOvE5Q== X-Received: by 2002:a0c:b752:: with SMTP id q18mr9538387qve.55.1614962146454; Fri, 05 Mar 2021 08:35:46 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:46 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:07 -0300 Message-Id: <20210305163339.63164-17-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/48] avformat/avidec: use av_packet_alloc() to allocate packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/avidec.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 5ea6160eef..fa0599501a 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -59,7 +59,7 @@ typedef struct AVIStream { * the MS dshow demuxer */ AVFormatContext *sub_ctx; - AVPacket sub_pkt; + AVPacket *sub_pkt; AVBufferRef *sub_buffer; int64_t seek_pos; @@ -1130,6 +1130,9 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt) if (strcmp(sub_demuxer->name, "srt") && strcmp(sub_demuxer->name, "ass")) goto error; + if (!(ast->sub_pkt = av_packet_alloc())) + goto error; + if (!(ast->sub_ctx = avformat_alloc_context())) goto error; @@ -1141,7 +1144,7 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt) if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) { if (ast->sub_ctx->nb_streams != 1) goto error; - ff_read_packet(ast->sub_ctx, &ast->sub_pkt); + ff_read_packet(ast->sub_ctx, ast->sub_pkt); avcodec_parameters_copy(st->codecpar, ast->sub_ctx->streams[0]->codecpar); time_base = ast->sub_ctx->streams[0]->time_base; avpriv_set_pts_info(st, 64, time_base.num, time_base.den); @@ -1152,6 +1155,7 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt) return 1; error: + av_packet_free(&ast->sub_pkt); av_freep(&ast->sub_ctx); avio_context_free(&pb); } @@ -1172,8 +1176,8 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st, for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; ast = st->priv_data; - if (st->discard < AVDISCARD_ALL && ast && ast->sub_pkt.data) { - ts = av_rescale_q(ast->sub_pkt.dts, st->time_base, AV_TIME_BASE_Q); + if (st->discard < AVDISCARD_ALL && ast && ast->sub_pkt && ast->sub_pkt->data) { + ts = av_rescale_q(ast->sub_pkt->dts, st->time_base, AV_TIME_BASE_Q); if (ts <= next_ts && ts < ts_min) { ts_min = ts; sub_st = st; @@ -1183,11 +1187,11 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st, if (sub_st) { ast = sub_st->priv_data; - *pkt = ast->sub_pkt; + av_packet_move_ref(pkt, ast->sub_pkt); pkt->stream_index = sub_st->index; - if (ff_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0) - ast->sub_pkt.data = NULL; + if (ff_read_packet(ast->sub_ctx, ast->sub_pkt) < 0) + ast->sub_pkt->data = NULL; } return sub_st; } @@ -1806,10 +1810,10 @@ static void seek_subtitle(AVStream *st, AVStream *st2, int64_t timestamp) { AVIStream *ast2 = st2->priv_data; int64_t ts2 = av_rescale_q(timestamp, st->time_base, st2->time_base); - av_packet_unref(&ast2->sub_pkt); + av_packet_unref(ast2->sub_pkt); if (avformat_seek_file(ast2->sub_ctx, 0, INT64_MIN, ts2, ts2, 0) >= 0 || avformat_seek_file(ast2->sub_ctx, 0, ts2, ts2, INT64_MAX, 0) >= 0) - ff_read_packet(ast2->sub_ctx, &ast2->sub_pkt); + ff_read_packet(ast2->sub_ctx, ast2->sub_pkt); } static int avi_read_seek(AVFormatContext *s, int stream_index, @@ -1943,7 +1947,7 @@ static int avi_read_close(AVFormatContext *s) avformat_close_input(&ast->sub_ctx); } av_buffer_unref(&ast->sub_buffer); - av_packet_unref(&ast->sub_pkt); + av_packet_free(&ast->sub_pkt); } }