From patchwork Tue Mar 31 12:37:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18531 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 B74D244B0FC for ; Tue, 31 Mar 2020 15:38:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A163568B128; Tue, 31 Mar 2020 15:38:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4662F68B06C for ; Tue, 31 Mar 2020 15:38:28 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id j17so25636346wru.13 for ; Tue, 31 Mar 2020 05:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8OcZCIJ02zLA3wXZXZh9IkxPIZcx/4Vc/bsCnqLJCck=; b=vE9oirDge6X7iRCMA4UjhQmdqrfwV08Z+YeuJThcQ1+jo0bCvQHU6z6h+vtSaE4R6F aeEvn/BPxFVh9cZ5pDgbaW/eCNyl9TY+Jxk+QuXBcZW2MgApKcYT0DsBEU9QKSLpFtTO G54TnSlhL1UirNvqqOZC9tR4x+ELFvnYVQH6qZtoB2oxMwZHAAJgo2snbeUSKdm5iimm Dou4BOyKkLnJGZ4a/6QiwTkW1872Ih7RC/m2Cn4gSvvAVJnAF5sKObapVd5GqRsgNtWv 1br9iPE7fUhwWVsXiplphLF1WPgtKE2XTGdOqIVaJrm0C9ZSI0rrcXS4HgGK10XXPR+H Wdcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8OcZCIJ02zLA3wXZXZh9IkxPIZcx/4Vc/bsCnqLJCck=; b=fS46KP+AXPX05uzxt/WvdwdWF6Q6nn7+CyYrNGfPF+JBeYk0BAlBEzjKKIdhqpmqPh dj7V47GpryTOoqoBqfhSei0MRMT8xyf/s84IjLec9K3VgzTCNqIn6kTOUrjLMWkj/mCA QQ9e6SfvkF3+sgOQD6ZeLfxN/ORQzYaRrTTs/Q9WbwSTk5xnul52gNOfWqnhxArtZsXU jNNpyCKdgLH/Dv5AKOUttdT0aKR2FjcaoXLI4MXJMFbU99rEEr13DCHs1KJOv76vfZbQ x7H9RcMUoyIo5KwGcLL5m536Qb/VC2XowFDwmZU4A9/z3tndCxxIhFwrMOg7pYmE5lV4 HQvQ== X-Gm-Message-State: ANhLgQ2VgBpWb5Gbm0HMIgz9Tpcz8ndfkn5FwRVEjgaeZS7bIo8oC3yT 7pD92rBS16FzygAVz+evR11wbDo/ X-Google-Smtp-Source: ADFU+vtOqz3WqHcfcF6LRoBeKgw8EvmjNTYZ5d6E4aHOrIJvmVUylET/Fw3UCP7cJX95vmYsxWMiWA== X-Received: by 2002:adf:dd06:: with SMTP id a6mr20656358wrm.189.1585658307419; Tue, 31 Mar 2020 05:38:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id p13sm26301532wru.3.2020.03.31.05.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:38:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 14:37:36 +0200 Message-Id: <20200331123745.6461-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> References: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] avformat/mux: Only prepare input packet if there is a packet 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It is unnecessary to call prepare_input_packet if there is no packet as it doesn't do anything, except when the currently inactive code guarded by !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX becomes active: Then attempting to access pkt->stream_index will crash. Signed-off-by: Andreas Rheinhardt --- This works very well together with Marton's patch #4 [1]: write_packets_common(): The prepare_input_packet() call can be moved into write_packets_common(). Unfortunately, it's not compatible with #5 [2] as-is, but I think I have a solution for this. [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-March/259203.html [2]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-March/259204.html libavformat/mux.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index bfd1bf491b..814d773b9d 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -771,9 +771,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) static int check_packet(AVFormatContext *s, AVPacket *pkt) { - if (!pkt) - return 0; - if (pkt->stream_index < 0 || pkt->stream_index >= s->nb_streams) { av_log(s, AV_LOG_ERROR, "Invalid packet stream index: %d\n", pkt->stream_index); @@ -887,10 +884,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) { int ret; - ret = prepare_input_packet(s, pkt); - if (ret < 0) - return ret; - if (!pkt) { if (s->oformat->flags & AVFMT_ALLOW_FLUSH) { ret = s->oformat->write_packet(s, NULL); @@ -902,6 +895,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return 1; } + ret = prepare_input_packet(s, pkt); + if (ret < 0) + return ret; + ret = do_packet_auto_bsf(s, pkt); if (ret <= 0) return ret; @@ -1191,12 +1188,12 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) { int ret, flush = 0; - ret = prepare_input_packet(s, pkt); - if (ret < 0) - goto fail; - if (pkt) { - AVStream *st = s->streams[pkt->stream_index]; + AVStream *st; + + ret = prepare_input_packet(s, pkt); + if (ret < 0) + goto fail; ret = do_packet_auto_bsf(s, pkt); if (ret == 0) @@ -1209,6 +1206,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); #if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX + st = s->streams[pkt->stream_index]; if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) goto fail; #endif