From patchwork Fri Mar 5 23:21:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26211 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 66DBA448FE2 for ; Sat, 6 Mar 2021 01:21:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BE3B68A993; Sat, 6 Mar 2021 01:21:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7B2468A370 for ; Sat, 6 Mar 2021 01:21:14 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id v13so4928331edw.9 for ; Fri, 05 Mar 2021 15:21:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=RgnRL7XJ76SlzF2ykAzxJTAuhNCxJ5+cd6TQM2RozJk=; b=gJi/OUVQOciRO1WM0HoGTQOJXZ+HpFnWCJQa7MCY5l47steiwy+61mTB0YOK9Cn5Bh mLW8jv40iGJPJ6R/K75vGi0+hwz7PzihrFOxRW3rlIysloOgKds/dOPThALDZL9LyOnB 1bXiO0GCIJiuO66AT3WrjX5hqi6fUsd/XaR9cFDgx9SVzWihx/5U4u4UxOVXD8R6J+JE inyJGnoVSNk+xEgmrAhzE5fwUFvE+6dqJDUZUh70ro2hOzBrOxIeDhaq3HF2F55+L49T Tw5xvM8RjoohahPDwAw4Zxj9OcRnhJvgvlmntrlBHxvwIWJFFIZignEvMW6dWC2dlvbC b9gA== 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:reply-to :mime-version:content-transfer-encoding; bh=RgnRL7XJ76SlzF2ykAzxJTAuhNCxJ5+cd6TQM2RozJk=; b=P61oC0ZR2Q3XWFOPPNfdOPZ2U8Kdq8RnWgQf5/SUlrB+EkeDNOo4VlQkoTZjJPzJ8Y JoqEAlmcJZt6uJ/N+k6kI9h0UC6fs9ZMoZgLmPwbxw6WLxFzDVW0hvI5Kw3lY2yKa+k/ KF7d7tXfHNsKVkJwS6iB0Ee35FyD/wKzYDgiNQEIILuOlQbU0bcANPnDy6Iv0GFxixac vyg0i9a6cuNB8IewVrOQAgLvtcY3R4ugw93/w1v+u2yM5szKo+E11mygoIMb3qynTXHX rzooBXz49pn3G1ZW8prxhe051xNnjB86WjfXXlextxklwsf9uS8p794h7TctEsFiY56w s3ww== X-Gm-Message-State: AOAM532qF4CVvqTTJJKLvcbWVyRN4YXcAr6rDZtFHDpyQFhNjEfqTg0T i51fUGBqg6sgf9SGISyHfMQfRkrMqEs= X-Google-Smtp-Source: ABdhPJz+BJiXo2KTfz4Un7zU5Ro2FyNpJGYXMWV3h0V86dIUIZz+JlyVydWaIMMvknA2GDe6KrhwEg== X-Received: by 2002:a05:6402:c7:: with SMTP id i7mr11676636edu.328.1614986473878; Fri, 05 Mar 2021 15:21:13 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u17sm2492232edr.0.2021.03.05.15.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 15:21:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 00:21:03 +0100 Message-Id: <20210305232104.496745-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mmaldec: Stop needlessly wrapping extradata in AVPacket 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" Up until now the function to add packets to the waiting buffers list uses an AVPacket as parameter; therefore extradata that is also sent once gets wrapped in an AVPacket. Yet this is unnecessary as the function does not really need a complete AVPacket, but mostly the data. Therefore this commit modifies the function to accept a pointer for the data and int for the size as well as the AVPacket* parameter, which is NULL for extradata. Furthermore, this commit adds const to the pointed to types if the data doesn't change. The MMAL_BUFFER_HEADER_T struct unfortunately uses uint8_t* for data that is not modified, necessitating a cast. Signed-off-by: Andreas Rheinhardt --- These two commits are completely untested; I just hope they compile. Could please someone test them? Thanks in advance. This commit provides an alternative way to avoid AVPackets on the stack and av_init_packet; furthermore, this commit also aims to make this decoder compatible with receiving a const AVPacket*. libavcodec/mmaldec.c | 45 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index cb15ac072a..7486f3c526 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -46,7 +46,7 @@ typedef struct FFBufferEntry { AVBufferRef *ref; - void *data; + const void *data; size_t length; int64_t pts, dts; int flags; @@ -476,27 +476,22 @@ fail: // (due to us not reading/returning enough output buffers) and won't accept // new input. (This wouldn't be an issue if MMAL input buffers always were // complete frames - then the input buffer just would have to be big enough.) -// If is_extradata is set, send it as MMAL_BUFFER_HEADER_FLAG_CONFIG. -static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt, - int is_extradata) +// Extradata (avpkt == NULL) is sent as MMAL_BUFFER_HEADER_FLAG_CONFIG. +static int ffmmal_add_packet(AVCodecContext *avctx, const AVPacket *avpkt, + const uint8_t *data, int size) { MMALDecodeContext *ctx = avctx->priv_data; AVBufferRef *buf = NULL; - int size = 0; - uint8_t *data = (uint8_t *)""; - uint8_t *start; + const uint8_t *start; int ret = 0; - if (avpkt->size) { - if (avpkt->buf) { + if (size) { + if (avpkt) { buf = av_buffer_ref(avpkt->buf); - size = avpkt->size; - data = avpkt->data; } else { - buf = av_buffer_alloc(avpkt->size); + buf = av_buffer_alloc(size); if (buf) { - memcpy(buf->data, avpkt->data, avpkt->size); - size = buf->size; + memcpy(buf->data, data, size); data = buf->data; } } @@ -504,9 +499,10 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt, ret = AVERROR(ENOMEM); goto done; } - if (!is_extradata) + if (avpkt) ctx->packets_sent++; } else { + data = ""; if (ctx->eos_sent) goto done; if (!ctx->packets_sent) { @@ -529,7 +525,7 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt, buffer->data = data; buffer->length = FFMIN(size, ctx->decoder->input[0]->buffer_size); - if (is_extradata) + if (!avpkt) buffer->flags |= MMAL_BUFFER_HEADER_FLAG_CONFIG; if (data == start) @@ -538,8 +534,10 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt, data += buffer->length; size -= buffer->length; - buffer->pts = avpkt->pts == AV_NOPTS_VALUE ? MMAL_TIME_UNKNOWN : avpkt->pts; - buffer->dts = avpkt->dts == AV_NOPTS_VALUE ? MMAL_TIME_UNKNOWN : avpkt->dts; + buffer->pts = !avpkt || avpkt->pts == AV_NOPTS_VALUE ? + MMAL_TIME_UNKNOWN : avpkt->pts; + buffer->dts = !avpkt || avpkt->dts == AV_NOPTS_VALUE ? + MMAL_TIME_UNKNOWN : avpkt->dts; if (!size) { buffer->flags |= MMAL_BUFFER_HEADER_FLAG_FRAME_END; @@ -594,7 +592,7 @@ static int ffmmal_fill_input_port(AVCodecContext *avctx) mbuffer->pts = buffer->pts; mbuffer->dts = buffer->dts; mbuffer->flags = buffer->flags; - mbuffer->data = buffer->data; + mbuffer->data = (uint8_t*)buffer->data; mbuffer->length = buffer->length; mbuffer->user_data = buffer; mbuffer->alloc_size = ctx->decoder->input[0]->buffer_size; @@ -776,16 +774,13 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, int ret = 0; if (avctx->extradata_size && !ctx->extradata_sent) { - AVPacket pkt = {0}; - av_init_packet(&pkt); - pkt.data = avctx->extradata; - pkt.size = avctx->extradata_size; ctx->extradata_sent = 1; - if ((ret = ffmmal_add_packet(avctx, &pkt, 1)) < 0) + if ((ret = ffmmal_add_packet(avctx, NULL, avctx->extradata, + avctx->extradata_size)) < 0) return ret; } - if ((ret = ffmmal_add_packet(avctx, avpkt, 0)) < 0) + if ((ret = ffmmal_add_packet(avctx, avpkt, pkt->data, pkt->size)) < 0) return ret; if ((ret = ffmmal_fill_input_port(avctx)) < 0) From patchwork Fri Mar 5 23:21:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26212 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 A0FF0449B3D for ; Sat, 6 Mar 2021 01:27:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7886D68A9E8; Sat, 6 Mar 2021 01:27:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC21A6807D2 for ; Sat, 6 Mar 2021 01:27:17 +0200 (EET) Received: by mail-lj1-f174.google.com with SMTP id e2so5008784ljo.7 for ; Fri, 05 Mar 2021 15:27:17 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=MsySgcJJ+YMnK/MHA8I8BmMHrGO915I1iJhadEmBxOg=; b=jm0rEumjwyTOLuQvt3oGdfaPWcxIaWSanAsPTzz8jZMYeU+I3NIWHW5zcFYZvyS6QI UojTu0NEF1SQjp5w7/hGzfyWLLEV3xLfadiNfl+U6ehhLk6sYXk1qMUUlO81sHg1ae51 wszTgqVxzsDlkslrekjaK5H7P47zZ/sdJM+k86sqYy5GcchpLH59t6Jp6vihks8f5d10 GuprdE1x5IJy9I5dSUWx4tOVN7YNAOFBRnFp9+2diAcvieIN4qT6pFY/yyhene8MjG3o jzw1kGFn8HZs/4LnpLi/AB3TBS4/zNhqECoxpsFE1trHTD1xjpf4cHSRGSLk67NCpp64 I8dA== 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:reply-to:mime-version:content-transfer-encoding; bh=MsySgcJJ+YMnK/MHA8I8BmMHrGO915I1iJhadEmBxOg=; b=dUQex/Xz4F+uorFxARzHhb+TsKjEmb10LxGENHv/FGPiu1cHjgxBCeeczEsZ7Mn4o+ kP3LM0XG+tGUT6lWXdxjTWUvjAS4nXTQr77d75X3dEEmUHpDS3usv+9UZXHzKmdSttwC 0JOqE1dTR51OjJHLcTj7S8ZzEuGog+DtZw60Qnx92gLOwZx0rydNtppVuUV0UelH8tZQ Nd4ohTkDPhThnVgxsy8hf53BjyIITVWonRh6teeXVgH5wYa79+GSgIxwtDGLYe5ZQW7G zoNocDCfcAi+WfREnxcGRouxnhJAIzLxIV1qmWAUXYeMbtgZZVTAEJnwQaaOeGykmH9q d18g== X-Gm-Message-State: AOAM531IfMMhT97qr5oqjEq+JIlLwSgUrRnSYT25zHHEwNHVeFOEOLlr aiZceMbeBOJtOpC2R6uXHGvYOwRQEVo= X-Google-Smtp-Source: ABdhPJxKabMoueMxaPOIhnk3o9DlsN3p1xlUNj9sPEIS86a5zkFRz4IHCL3yIpLCyw+Nfr8mbz0bPA== X-Received: by 2002:a17:906:2710:: with SMTP id z16mr3854115ejc.176.1614986525683; Fri, 05 Mar 2021 15:22:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u17sm2492232edr.0.2021.03.05.15.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 15:22:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 00:21:04 +0100 Message-Id: <20210305232104.496745-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210305232104.496745-1-andreas.rheinhardt@gmail.com> References: <20210305232104.496745-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mmaldec: Return early upon failure 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" This avoids freeing a NULL AVBufferRef*. Signed-off-by: Andreas Rheinhardt --- libavcodec/mmaldec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 7486f3c526..0ea07ea787 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -495,21 +495,20 @@ static int ffmmal_add_packet(AVCodecContext *avctx, const AVPacket *avpkt, data = buf->data; } } - if (!buf) { - ret = AVERROR(ENOMEM); - goto done; - } + if (!buf) + return AVERROR(ENOMEM); + if (avpkt) ctx->packets_sent++; } else { data = ""; if (ctx->eos_sent) - goto done; + return 0; if (!ctx->packets_sent) { // Short-cut the flush logic to avoid upsetting MMAL. ctx->eos_sent = 1; ctx->eos_received = 1; - goto done; + return 0; } }