From patchwork Fri Sep 24 06:28:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Shun Ho X-Patchwork-Id: 30546 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1196701iob; Thu, 23 Sep 2021 23:32:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb0tZas8LI2H/NY0wW3Rwh60ce3P/QPUvm2OWmnfjDjnIjZ45mDqWAuJ7d6UQeLj4FOIyp X-Received: by 2002:a50:d581:: with SMTP id v1mr3269363edi.210.1632465138306; Thu, 23 Sep 2021 23:32:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632465138; cv=none; d=google.com; s=arc-20160816; b=BUV0hWk7Xx5DBFFR/GbipPj9fq1URvlf3RH/IsliKkAtxiaPoRx64S3iDQ3Z8MVBmP FF1lZT1okWOo++TQr8208oKZx4tlsZv+uB0tkSnAQ2MVKxTH9ESneRw/UGlzIPwXeyrr 8KSLQAIYlVJV1fb3eed4K+ZYCG9xUxZg5No5KoX2CoYoqlTtCs1GG6tVvVAyjZ4r3TNi zr6lR/r+sReRlL72GdfCIM18THKPCbcE5/sLJh5Ot0CJMj5gXVlLzq9ml0y5pOVlrJ/Q IQoGgzQe8fvAdbxzQKYPfzqZf0kzEkUzQhA8hU882FBrt9yKQ8aS++ldZiDSzLxuaV5E Mosw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=3AS26pkdCZO9VYJZ7+CzCpEsWn0+hzihK7431nv/Xic=; b=ZU7iZMtjzj9uKxlkj4ubemBwX+EnFXXfIq43BCUwiWAFZG7fh8m+YsaExARX9fh74C QSo4fZwo2tqMYpuGnnNFjekiKlmX1U0lMaZL0BavbXEULBQG/+NAAUU+5GQhY2ue4yVu uYrgx4NfIBDJjy91YZNLgozT6kl50NfI4MEOGIqL53bjAguZehAhCibWcJ4niaYXa9on XiFlLn5ad3haWWj01YrRVTWu9o12M69sgJ89LmNXepGNHNCvTf/XxhjdUxueH82obNC3 O2vnm0RLzqvE7WuWFZPxLcXLG58o5/L0vQabm4BO5R2o10fLSbuvSFiBpAiyhFddv/p7 Ow0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lQe49vO9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g15si8613546eds.75.2021.09.23.23.32.17; Thu, 23 Sep 2021 23:32:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lQe49vO9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BA4D68A607; Fri, 24 Sep 2021 09:32:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5032668A1EF for ; Fri, 24 Sep 2021 09:32:09 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id t1so8962527pgv.3 for ; Thu, 23 Sep 2021 23:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E6zp5Al298nQG9GvjSdnjU9Y6qkycrOmu+/kg/VSCmA=; b=lQe49vO9r9wtuHVutSSM26+xenJ7upH4OxVwD7VBBH3fW/IF0mDt0Lf3THVdixA7tz ARogggwWiObHCHaI525e7smYLQrtK63+dp80tihu/URTCZ+zr1CBANDVX04849qeUCBM vifwMv+U8rlLuNI70in5Y91VxNaPMVXdJRDhQMd8MZu6/RFE5yr3yclCaEjId6ftNAcZ WLshSezrBzLTkZ6K3nDd5AbDdozOkDIqvcJyxp40dX535chf6dS9sHi8bJKwqrHHXG7U jm5AR+KK3WxxJRLcSI6zh8UiqYReLlk1VCsZ8uMARXMM3cFyU/wESk4Tjg2IBtt9qfpP bgGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E6zp5Al298nQG9GvjSdnjU9Y6qkycrOmu+/kg/VSCmA=; b=bhaqnvWS1pHysx/Q0oZg+113fKyQ2p2i14gNOfpJ897DdkAjHHl/8CYe7XO5pzoRAF NgNJG/ppGS2MqzuAPVpR2fNB8aKMJ0vBhp74OjPvtuEPeWVtiLpo2q/DBe40OJ3Sd+6v 76bBcpN+ekj6tm9ZhfXD3NuxzftW0S/lBMClW33N+Gq59NP5P49ei14SI7jX6d0Hqfna Vkqg7KnHf3Lyy7R9SoFS/OZFp3jxBaAZ+h1ME1LjiL+BOYxpOXy8PV8rT70o5PjjP9uv Mjkwi/QZZbdnlt4nZfRR5JhXz2VqZwwDfPtfrl77M+cvXhAxhGqm38/A9+EONiBmapf7 9f6Q== X-Gm-Message-State: AOAM5331japR962SglsSw322QRxlwFU2MMpRC3x/65DvNZ2zfyBI05Lw gigigdoy0DaHqOH6pldXbyuvVM9l0R9DkA== X-Received: by 2002:a63:8f06:: with SMTP id n6mr2424805pgd.315.1632465127297; Thu, 23 Sep 2021 23:32:07 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id d3sm7427886pfn.156.2021.09.23.23.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 23:32:06 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 14:28:35 +0800 Message-Id: <20210924062838.7461-2-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924062838.7461-1-cyph1984@gmail.com> References: <20210924062838.7461-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mmaldec: use decoupled dataflow X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Ho Ming Shun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8rCIjojzh8bR MMAL is an fundamentally an asynchronous decoder, which was a bad fit for the legacy dataflow API. Often multiple packets are enqueued before a flood of frames are returned from MMAL. The previous lockstep dataflow meant that any delay in returning packets from the VPU would cause ctx->queue_decoded_frames to grow with no way of draining the queue. Testing this with mpv streaming from a live RTSP source visibly reduced latency introduced by frames waiting in queue_decoded_frames from roughly 2s to 0. Signed-off-by: Ho Ming Shun --- libavcodec/mmaldec.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 03e15420ce..b97cc6ff5e 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -578,6 +578,7 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt, done: av_buffer_unref(&buf); + av_packet_unref(avpkt); return ret; } @@ -663,6 +664,12 @@ static int ffmal_copy_frame(AVCodecContext *avctx, AVFrame *frame, avctx->pix_fmt, avctx->width, avctx->height); } + frame->sample_aspect_ratio = avctx->sample_aspect_ratio; + frame->width = avctx->width; + frame->width = avctx->width; + frame->height = avctx->height; + frame->format = avctx->pix_fmt; + frame->pts = buffer->pts == MMAL_TIME_UNKNOWN ? AV_NOPTS_VALUE : buffer->pts; #if FF_API_PKT_PTS FF_DISABLE_DEPRECATION_WARNINGS @@ -776,12 +783,12 @@ done: return ret; } -static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, - AVPacket *avpkt) +static int ffmmal_receive_frame(AVCodecContext *avctx, AVFrame *frame) { MMALDecodeContext *ctx = avctx->priv_data; - AVFrame *frame = data; + AVPacket avpkt = {0}; int ret = 0; + int got_frame = 0; if (avctx->extradata_size && !ctx->extradata_sent) { AVPacket pkt = {0}; @@ -793,7 +800,11 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, return ret; } - if ((ret = ffmmal_add_packet(avctx, avpkt, 0)) < 0) + ret = ff_decode_get_packet(avctx, &avpkt); + if(ret == 0) { + if ((ret = ffmmal_add_packet(avctx, &avpkt, 0)) < 0) + return ret; + } else if(ret < 0 && !(ret == AVERROR(EAGAIN))) return ret; if ((ret = ffmmal_fill_input_port(avctx)) < 0) @@ -802,7 +813,7 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, if ((ret = ffmmal_fill_output_port(avctx)) < 0) return ret; - if ((ret = ffmmal_read_frame(avctx, frame, got_frame)) < 0) + if ((ret = ffmmal_read_frame(avctx, frame, &got_frame)) < 0) return ret; // ffmmal_read_frame() can block for a while. Since the decoder is @@ -814,7 +825,10 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, if ((ret = ffmmal_fill_input_port(avctx)) < 0) return ret; - return ret; + if(!got_frame && ret == 0) + return AVERROR(EAGAIN); + else + return ret; } static const AVCodecHWConfigInternal *const mmal_hw_configs[] = { @@ -846,7 +860,7 @@ static const AVOption options[]={ .priv_data_size = sizeof(MMALDecodeContext), \ .init = ffmmal_init_decoder, \ .close = ffmmal_close_decoder, \ - .decode = ffmmal_decode, \ + .receive_frame = ffmmal_receive_frame, \ .flush = ffmmal_flush, \ .priv_class = &ffmmal_##NAME##_dec_class, \ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, \ From patchwork Fri Sep 24 06:28:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Shun Ho X-Patchwork-Id: 30543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1196790iob; Thu, 23 Sep 2021 23:32:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxxFJLlS+7WAhlXZPqaUumtKiVIR7TnYWxhb9d8ZUz0nfDLUGh0i3xBIxgyI0GCrdw0VRL X-Received: by 2002:a17:906:3383:: with SMTP id v3mr9765513eja.213.1632465147509; Thu, 23 Sep 2021 23:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632465147; cv=none; d=google.com; s=arc-20160816; b=uLwvtJjEPi2LE83ThXfTZ7/a4XqGPc+5vOh6CiJbFE7a74kKp6kDVhZhIH35arRPK4 VtiglwNQIs86CTQzNWVb8Iv4mY31wv+nzAD7kkNwfYYnk3yg1Wipi481PGslfVy/+mD4 hNYuOHMKIqpTA/ZKhpXAhCQAUXUqJtdWbfRDP5EdSBe6s0QOnNENooAg+8xMGDFNxHNm 2LYKZUe8X3ZskHiquekR6VeTGe/Q0q3+UlniabkdXvQfaBpUhDFDv6dIHLVvFOHLb1sc 8IXTg8dNIfSLMqIt2mTc/VhhS6+OVEK912F343U2WfZDj8dn3q7E76/klcAEQkG6WkqC sx7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=/12zpajLyGw5kNnVAnNFq1oXj+B219WhxTER4syxgj0=; b=qiWSxopmdaiOSDG6PNJy0ai+k45bH74lockIQWbx3tQhlDQHk6L4vTMSH82Ydm+bkP GtanFexIOclRGwO5EcTc5MmWfez34a1Rjeh8JVvGLaNWhFT/AlQzooicQ6QBkhkt/0P1 T1GcmEbT0L64WBqn/tDpp4B/lt6b0NNgRGolRx57ntEhK2J1w7M4ocd8v80tmEvo1DDn 5dLZpMMd78pbYCegvgID9dlk/asyEJ7T82+Wz/YkdDQhjCTo8aQQZ4tx4zaajFwr0OqE 4UbdKTs9rsgCI4FVcp3dG3ZlbY/xioBlMetAScC6fXklR6Ysk34gAmooeBxjumcSa2sy NpDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=m1blKJuD; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i14si8456495ejo.653.2021.09.23.23.32.27; Thu, 23 Sep 2021 23:32:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=m1blKJuD; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA61368A62F; Fri, 24 Sep 2021 09:32:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B347468A51F for ; Fri, 24 Sep 2021 09:32:12 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id me5-20020a17090b17c500b0019af76b7bb4so8893550pjb.2 for ; Thu, 23 Sep 2021 23:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vRsi5GaFSqRbVhqAUeHCD2zyx1f407pqNIu+ocownA8=; b=m1blKJuDqnwoksLlmcvj8cV/7RcXUIGKq3bN8TxzjRfVh5jCpEwdPNWG2Qim1g/u4K TiERzNlKbD8R5GWQ4tKQofDIN9y5rUQrthK8rMfDuYMR68ESFUFJbCCClw5dwMrOXPMY X9etbaY5ADTbT7jNpP9FmsZyjQ99vx3ha2TYUyYn6x2vyjlaaV/flx0hQrROEsYTpF2U qMs+g8UE08ZI3gR4pYX9ZgiGD/+LpIFcf+c/d7MjojXqiHrWa9sCSnPmStjW0PsTHjkf MjjM4HwMhagEZcVE5MEn10Pc4dYBT91t4Ec6fUX3YuWHUVXAn3F4UQ+caI+Qp1q0RgfC MxKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vRsi5GaFSqRbVhqAUeHCD2zyx1f407pqNIu+ocownA8=; b=UzMMVydzOJrHrl9UC2yazoqclquE0WysVf0Ph5xVDSPBdjczBlvnSrMoRaUG20O2Cj SC+UbZhD75ZuNdlkejqHFYkl5+OYNabF+TxUW0QMI39bLnSBQOGHPd01rDY4NNtTXhqE 1B6gRSdPa6w30jSOWE+7Q/2G2oLp7C+5Qk6DLTdecspdeBPUHr1BSyCP7PusgNIQ/F6Y v+vvdhbRXOtGyA/P7thdtOYegAdXfrLF0klOe+bjfpbk4GF/Is2QljlUIjsfg2w1sTnk ykkAvfdzDxRYSdrFSYdwmBFsG+xHbVrib02HsNmPM89l79Tw2Svn7tM3qFVT4z5J6+0p PaAA== X-Gm-Message-State: AOAM530Lf3ISOUqRyA7oTtyJN4V8FWm9DKc2By50vPOkBgYoZs8uD78u IQTSaaAnsuAEuJFOqXf2gtzq+vOLdk6Cww== X-Received: by 2002:a17:90a:9a8b:: with SMTP id e11mr324380pjp.102.1632465131024; Thu, 23 Sep 2021 23:32:11 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id d3sm7427886pfn.156.2021.09.23.23.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 23:32:10 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 14:28:36 +0800 Message-Id: <20210924062838.7461-3-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924062838.7461-1-cyph1984@gmail.com> References: <20210924062838.7461-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/mmaldec: use avpkt from DecodeSimpleContext X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Ho Ming Shun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0YyfE0jC17iA Use spare packet allocated in DecodeSimpleContext to handle packet submission into ffmmal_add_packet. --- libavcodec/mmaldec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index b97cc6ff5e..aab107d325 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -786,10 +786,12 @@ done: static int ffmmal_receive_frame(AVCodecContext *avctx, AVFrame *frame) { MMALDecodeContext *ctx = avctx->priv_data; - AVPacket avpkt = {0}; int ret = 0; int got_frame = 0; + // use spare packet from DecodeSimpleContext meant for simple API + AVPacket *avpkt = avctx->internal->ds.in_pkt; + if (avctx->extradata_size && !ctx->extradata_sent) { AVPacket pkt = {0}; av_init_packet(&pkt); @@ -800,9 +802,9 @@ static int ffmmal_receive_frame(AVCodecContext *avctx, AVFrame *frame) return ret; } - ret = ff_decode_get_packet(avctx, &avpkt); + ret = ff_decode_get_packet(avctx, avpkt); if(ret == 0) { - if ((ret = ffmmal_add_packet(avctx, &avpkt, 0)) < 0) + if ((ret = ffmmal_add_packet(avctx, avpkt, 0)) < 0) return ret; } else if(ret < 0 && !(ret == AVERROR(EAGAIN))) return ret; From patchwork Fri Sep 24 06:28:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Shun Ho X-Patchwork-Id: 30542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1196895iob; Thu, 23 Sep 2021 23:32:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyfzeiDA8W3g/LYZhrfwAmfZc9CbUT/E9RRw5yT4CM9rPbDHpc/Q0+xsZCu6lJ4I0mLaRd X-Received: by 2002:a05:6402:5252:: with SMTP id t18mr3173893edd.13.1632465157082; Thu, 23 Sep 2021 23:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632465157; cv=none; d=google.com; s=arc-20160816; b=j2Rksv3FBIwrPB7cVzsthczK62rzDzwHVPEro0wWcN2Lk8W1u5zw9OB4K9/Y9RyY7z tIGEFw1orm+rbXr9WgWJbZL3TxgJeEUyCxUym7oNmIcwDTYHH9h84I1/i3JA6bjctoL+ tc/XEeg0buVxVUKchLmh8PemVL3vfrLHBKIxe5wWoR6iRuApms/xRp4tPz5rhvfBL7Ku oaZXpR7kFGQAON6KYUnTaEtkxAhqxPbmLZdZypHu5dykvVgMSl1EQ7jWY8KwWVkgcP5j ycB83QIhBpYr7x2fHtkS/g4azcXN9eu1cTgHcOmztDfdozwltnTb+8sufJxMPG1td/Eg BD6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=3wNzyw3gW5nLdQj3xWENyhzc8eEeCWDNYIMbbip0eSM=; b=MyYHrTtzeKXKHYHpYZG3N65P1RouwgckWG7jy9rAYlVqdWJv/SZuh8OeyPYNHBtUZ5 aFXSu04LMLQ+qlQY7UAsgIRC+GH1SrK/vrgKT/8ytkih3U8ZSuWaZJ9AD48T/jqB+Yl3 ZYpnuY5OUvRVXtx7ogabjntwRIq6uvqJsPmn+LHL5KiB1NWGAFojymUt8DG2hwK0LOfZ RdmQxEgG2GmxX3p7Wx93pt9eX0FMCpA274RuzwJ8YXUoh3IMnCPhXCmJim8V7Z91osDQ CAHWTIJWKMVa46tpbaRCuNk/08/PTlYmHSs4ydf9geST+mI+dWjyqsLnjMwk+jjLx0NB 6EyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=khHAHMVK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x22si2490147ejw.16.2021.09.23.23.32.36; Thu, 23 Sep 2021 23:32:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=khHAHMVK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB9C468A64A; Fri, 24 Sep 2021 09:32:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E57CC68A636 for ; Fri, 24 Sep 2021 09:32:15 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id j15so4365982plh.7 for ; Thu, 23 Sep 2021 23:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pVl5uspq7xtrtIL+i+e5DjRpxKoCbKR/0XfFSOk62Dk=; b=khHAHMVK8LbH/FIoQ2xwuZ0SNHAjaeLUGINrTlJbOsVg5+JlnrR6yNSp8HZqE/+bzn 88iALvXx1240WVDuHVSDsKfVJuTcEQnL07RKgnecUjoarLrEWbaFmgLF9AIekuMfr8Wg /ueRR9ITTSZu/owUeMjn6d2JAUy+Ndhc7RbdR0Pv3mvwoATEIE0J0BtszoAjFseptkGb jRVuMfFWrVw2qcZHo+OLFWXNlekQ7HfhC+R8LsqO3ufuWDsoiAwFzbJOdWi9jSvITvtr 5nIMm2/X0x1DZTykPehJWgKp8tPe4fxTytKf6JNLg5xIv00zvfWe5jPYT40w0OwbNo8h bQgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pVl5uspq7xtrtIL+i+e5DjRpxKoCbKR/0XfFSOk62Dk=; b=zIs7EUiAt/Tq18uxb/DEsUFJgIXus64u1iTuYtJZtik0iyg+dhaTlQSxRzlmkE7qVF 9xM9peE1vtffDZyc9qafAdn/t34Y2USmhea72vSdT1ZkpPBSs4TdjT3JrX+Gj/Zi7kJo +6HsIOr4BNRJehrrjcK55V8R8QK2l//9ulezi9tyUhQHk9TkVcEkBHCFAUi+fAyL49tn j6vTnNU3bbyhm3jTFAT26aexWnRcQ/YW5f4KPqkc1XVOpJOaMnpQUniNFMlHRsHd83sl cdEEeB3iGNEdwJ5oMamYkPtM27XCKYJn+E89/kxkrc634tlfQ0aFZ/PbQLLEJNM4aQhD TOmQ== X-Gm-Message-State: AOAM531z046sXaGUcLiiv0hH/eNCO91kJzMS73PbjY8SDVqvX42/HORQ xKZJCH6fw6tlNzCRUdOAexAXv0HU915efg== X-Received: by 2002:a17:902:8606:b029:12c:2625:76cf with SMTP id f6-20020a1709028606b029012c262576cfmr7863054plo.17.1632465134131; Thu, 23 Sep 2021 23:32:14 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id d3sm7427886pfn.156.2021.09.23.23.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 23:32:13 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 14:28:37 +0800 Message-Id: <20210924062838.7461-4-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924062838.7461-1-cyph1984@gmail.com> References: <20210924062838.7461-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mmaldec: re-use AVPacket for extra_data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Ho Ming Shun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ngaHZAuJs3r8 extra_data and normal packets (from ff_decode_get_packet) processing do not overlap, thus we can re-use the spare AVPacket to send to ffmmal_add_packet. Furthermore, this removes allocation of AVPacket on the stack and stops using deprecated av_init_packet. --- libavcodec/mmaldec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index aab107d325..0aad7d0bb1 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -793,12 +793,10 @@ static int ffmmal_receive_frame(AVCodecContext *avctx, AVFrame *frame) AVPacket *avpkt = avctx->internal->ds.in_pkt; if (avctx->extradata_size && !ctx->extradata_sent) { - AVPacket pkt = {0}; - av_init_packet(&pkt); - pkt.data = avctx->extradata; - pkt.size = avctx->extradata_size; + avpkt->data = avctx->extradata; + avpkt->size = avctx->extradata_size; ctx->extradata_sent = 1; - if ((ret = ffmmal_add_packet(avctx, &pkt, 1)) < 0) + if ((ret = ffmmal_add_packet(avctx, avpkt, 1)) < 0) return ret; } From patchwork Fri Sep 24 06:28:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Shun Ho X-Patchwork-Id: 30545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1196997iob; Thu, 23 Sep 2021 23:32:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0kjIpp3M9TY4AwjgtzYUCQDQY7fzFY3ADSGEwjIOA+WjX9U9ultEMkEcmC5WTwu9y/2aZ X-Received: by 2002:a50:a0a2:: with SMTP id 31mr3112390edo.252.1632465167275; Thu, 23 Sep 2021 23:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632465167; cv=none; d=google.com; s=arc-20160816; b=x91eoESFn5cWro3npS2Nz4HHoebGzUQq05+HGQUBaQb+db144OaGSWaIT5YnYrwYsL pAQS/6+e6FIdeaO/bEt7Aa7Euzb/QJl1DIHOyoT1CJ2tjzAyUgWaU5AfWMkvDZRdChlK 2Uy2nkjQZoEHbRKDWvXwXc7wqRQVz7rm36wI1VFNGIvXXCUTydvXc1ptVaB37GIbsffY jAywip4iuqak82cvMOrINycaeXxgQe5Lpe0NZIYzDW60vMjtS0VU9e31PesjHHcCEMpu vcmybQdlSZlSrLDNh2xXZgsacVB3en30iGofEHD5MmegTpdieqqStzjwR2ACmszlzbph 5yAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=xdOF07kkIs3bFsyq5GoQcoBaLqBBFTxwRMiNcHXjV9Y=; b=gXZ7/1fB2GyM4yU1FH/2CW/o1v3BAHnuPHnpEZj7QTYinHGqmaAZryS3GhTiQzYvJC wjxfRc5xKz2RBDw+lIIyn+FiSGnnSaPPQSkJvVXHVQhTauN95HdCplDEC0hrw5yx6Y7G RvFJXl1Ue0PdyKCGnYQWbRhn5eJDbeB2ZZBb7vV8xZFcErjuk8rO9adLQEBiWwS1JkW0 pcEqyUtEStWiSvqh3oKunQyPRzylwLDrIY8Fq2FIMdXSar8cj5be4yr8lP8gNADVrGJX 1IZcYSvclunHX5kbtqbYxdpD41yFNiiIWIFtZem9M73pNywN4NELBSokQ8c53sk7mTdt qVlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LPCzSio5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v8si11375450ede.567.2021.09.23.23.32.47; Thu, 23 Sep 2021 23:32:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LPCzSio5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF0B968A697; Fri, 24 Sep 2021 09:32:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23C9268A664 for ; Fri, 24 Sep 2021 09:32:18 +0300 (EEST) Received: by mail-pg1-f182.google.com with SMTP id h3so8941198pgb.7 for ; Thu, 23 Sep 2021 23:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5C3aeLMxhmqt+VDCKRjlbCzwdde4ftod9UolbIbPP/M=; b=LPCzSio51kdHLE4Pstth5VwbulaM+XGrpkt5L66Bzc0opGJHdTDtsQ8KGrv751kDij 2JLQPmJAMDrLHJ2naV6wwBspER/AbTmwhJz/KcKp5YP+aKbeZdwKi+MI03O9KJXNOoKo 6PdCSrBPLVJm2w9iB1KSY+MPvUvo8YE26eBKLIf7ip2byE8o1Hq+rpQZxnu+V2rlIoNk 8BHajRVWMSjyVH4Oflv8KHdUUltoSq2qYgfPLgjcnK0MxRQcnfzw3c88apBgp6UztPW0 0XUpgset/ODdGIeSuKWqY+LxIw04D7WXnP6674LyoCkhQQ7AhdaDErLgJ8x02duzKQ3c GnIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5C3aeLMxhmqt+VDCKRjlbCzwdde4ftod9UolbIbPP/M=; b=wJTDTNg+ncdhKaEz64ncePBdjqs3HLoMygndfTZdERkm6wbWZsoPQxjwBCfDD3nxvI JTz1Q+Q3WeEQy3Jt3elfi5bm7XnHfWuMJucWyQ7fnzzG0P943k0XbnRpA8SXDHjdd/Uw eY0S7gHfGwcXncF7Cq5xq8AACOQw2nBqD0cvpdR3j0NOQj0Mi2uVMZYPapYxwc0cl7Tu y+ApxCnn59JNYLee/EsCs1vu+5pIkZVF327hSygKpzg8CLVYHL2SKXRu4V8fkFY7ht/e z3mkOA/3rfH2d4LahpeYhsDtdAp8ufx9GMoiDI6cNfXEhedw61HWLaOkbhjVy/LAF/8Q fefA== X-Gm-Message-State: AOAM5325oSMFuMZEJZX4NdNO0rWR5Wg4rWib5fZmWeSD5RAqzvXhvUvW Lxx4OKWPic+H9IXoLwdXTbT8i+OKuook7g== X-Received: by 2002:a62:4e87:0:b0:447:ce02:c32e with SMTP id c129-20020a624e87000000b00447ce02c32emr8149267pfb.33.1632465136246; Thu, 23 Sep 2021 23:32:16 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id d3sm7427886pfn.156.2021.09.23.23.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 23:32:16 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 14:28:38 +0800 Message-Id: <20210924062838.7461-5-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924062838.7461-1-cyph1984@gmail.com> References: <20210924062838.7461-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mmaldec: fix pointer type warning X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Ho Ming Shun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6ZRqU4XI8flc Signed-off-by: Ho Ming Shun --- libavcodec/mmaldec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 0aad7d0bb1..85555ec0fe 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -660,7 +660,7 @@ static int ffmal_copy_frame(AVCodecContext *avctx, AVFrame *frame, av_image_fill_arrays(src, linesize, buffer->data + buffer->type->video.offset[0], avctx->pix_fmt, w, h, 1); - av_image_copy(frame->data, frame->linesize, src, linesize, + av_image_copy(frame->data, frame->linesize, (const uint8_t **)src, linesize, avctx->pix_fmt, avctx->width, avctx->height); }