From patchwork Fri Sep 24 09:04: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: 30550 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1291758iob; Fri, 24 Sep 2021 02:06:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAJiK9wE177TbV8CDaYS/rl6PqEpct9KldjIVVPWlSTJvBQVkiKiJJFZy0pH1484I+zKU2 X-Received: by 2002:a17:906:fc7:: with SMTP id c7mr10211290ejk.333.1632474385578; Fri, 24 Sep 2021 02:06:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632474385; cv=none; d=google.com; s=arc-20160816; b=gicynsZj/0RefUKFP0ftasJgPagavRTSvaPGpfClydel/VGl885CgxMtVS2Ih1ZqUb GNPXlvF79+EA4EUaNH1DZ0Lukc9dIKyEN1TWTPGKVddV+Q45WTvSPO0OzRjkHZa3WswI 3NfFA+UOEbe+EkfVtAPtIGcitQURLPQwE92Vkh6LLlGAOeb6LdkZwP+N/x59/p4PF5q6 dyM1YKDbYtFDNC0LZ4FoFPJdLO6Zt4NPl5NcBvEtt7KwcalUNzrk69aqAs0cFG1XpfeJ CzUW5EggH4b2ih+2GwvQ7cT+W8BwF3+5oYQD6rnChhbe4AKN6g+4ZNYRASjEGyDP9K8t mU8g== 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=3ujlG8j6N620Yd5+3oh68sn2jyLEj7b8iFONPR9NfCE=; b=ZCD63veUWLK/HNEke6kpXN8Lbb+jZdXGB7Q2kIchscVGZmCklVAeKcsdJ/RlusGEEA KV3Jmv0DIN86UxS6pxQd68dUeRKnAqWN1tR9Yy+vllrTUQS/TuPE7Js87sqWyqCGo6xl nyKfMCr34sdD3Nidmv785FGtLl2HNv81knY6qKC6+ZDCGM7wts601wyHJQyW4Magfq3+ sBaVhN61ibCRof323nL57X17NpEjQrb7pEp57AgcK5s53XelZDj/K4A5C02llg9laF6m YDT/Eb3gccUZXTcEuyyyRnYK/gIUbxYixhVxBesUUl2wHkGVfGzydtkHRL5sJ+WITkr4 fnww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EhtNEyQV; 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 z18si8182609edq.553.2021.09.24.02.06.25; Fri, 24 Sep 2021 02:06:25 -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=EhtNEyQV; 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 C18736880FC; Fri, 24 Sep 2021 12:06:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49BF868078A for ; Fri, 24 Sep 2021 12:06:07 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id t20so6504016pju.5 for ; Fri, 24 Sep 2021 02:06:07 -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=JPfkHHWxLqb95JZT5ZNp0PHdq4ucGQxUii+uAZrdghM=; b=EhtNEyQVu1IyqTWcBmFNkFcU3J5TtIwKhAyQc+ko75IeceDZHpUkrxMoVZ4mFfkY+c 7zRGLoPi45tIrdOMxPCUyPJOe4eQKGi9fVIaJhPrGiJasuVG+7hlKk0N2UZb6tD7bsNY 29L96PVCi4PMV12FjhmUSYqFMYpz66alufXGWHT4fK4ZK29KfCWN2Je3v3GMZoHfOBwl +AUO1yh5Rd6QQ9kNJcO81porVI6bTMZyX+qr6UQnlC5T0UYlKNSx1vKOvPt7hna6P+H8 nr/ab+SCnFRYko4uWct/yfOuuYJ27YiCwY01c+Y80Yn7RxFBhCWSu5HR3Q05SKF5Kuf4 mz3A== 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=JPfkHHWxLqb95JZT5ZNp0PHdq4ucGQxUii+uAZrdghM=; b=zOUVXdZGhxmD7EknBvOhaugYmW/8u7+Hz7z+XefIwposYBEhr66v/PFCZ9EjvEqLcs 2xpTBcljtdv0fQdWgMazLSOWVb10xhJkvzTZ48hTy839vuE6qVP7Y0YFfKUxVw+1I23P oTUvXNDvmKS6Vmyk5iLF0zWQVpOKiRG2v/gW/Kpm75Wf24YYNNNZOj/46cNEXpxHoC7M 12Z1TKZM5vGdcdwWYTAYfKEqgghz1psKWh7IffhF10A9PCJvvcFefXwf5znMBSJ4idj7 LybEOAWchC9tIQb17D49SUtdy7yjzSkL+VyUCRpZdq1gsfaYCpZYEEW/dPwrcAy5+3ZD 8MpA== X-Gm-Message-State: AOAM531qnQa5UPWjqlGv4+UQvReUf8Mt7Lp2Khmc6qxNkJ7Xsc8QaOuu nzTGUn6CTn5t6bhWcDcqRjOZ13Zjb1fzPg== X-Received: by 2002:a17:90a:1d0:: with SMTP id 16mr1010836pjd.60.1632474365362; Fri, 24 Sep 2021 02:06:05 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id s2sm8029279pfe.215.2021.09.24.02.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:06:05 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 17:04:35 +0800 Message-Id: <20210924090438.11954-2-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924090438.11954-1-cyph1984@gmail.com> References: <20210924090438.11954-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: J9FZk6UQNVjm 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 6c3e5d99b6..d4788b33f3 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; frame->pkt_dts = AV_NOPTS_VALUE; @@ -771,12 +778,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}; @@ -788,7 +795,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) @@ -797,7 +808,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 @@ -809,7 +820,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[] = { @@ -841,7 +855,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 09:04: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: 30548 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1291919iob; Fri, 24 Sep 2021 02:06:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4OpJRI5zdzlajDUWiwoYvjKq4nVWVc8WsWK2CV8gB7rjGsbNaQ9F9uinbwf9FvYGYH4f9 X-Received: by 2002:a17:907:3e0f:: with SMTP id hp15mr135462ejc.58.1632474396265; Fri, 24 Sep 2021 02:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632474396; cv=none; d=google.com; s=arc-20160816; b=TfdAjiw/fuUrojKu31PYcD3kpGWY3nYbt6el4E4OzPzzFjjuZXdgAOcI6HVxTS0nVv NTfapsCrfhi04yNtga/uker3WP0jxB2lYklvOkLWqfy6Eji90qkHqEnhnFj9Ba69wioN MtetL2jXTwib7fE4nRaQaAx+5VoHIlvO/MbbbMuBVNWGvSrVioh6D3KG3quLBoZ8qT0I sK1ErIKTRRNT2kpmZbTnWtx/IadiFiSyLVsiU0nGfc0XG5R3T03RIJDR25R7vu8nC6Jh pKIpc9ZIXwYIMnbKV+1MEwIbpO2U8EmgBxeCJ8Lu9GOAVMQfT0oJ1uYb+Kjc4xrPcNcN wyhQ== 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=0ts8yiuxn4OH5iHcGrd5YuaQ61nTHpm+kBvOzYzrdFA=; b=qVwmZxNoSb0OV7kYucmeoc1EIDHH3HdSglESvZtLKl+6Z1P7IaQ0zZVh9H6pf0CWGP 0AVnkFh+Xrq0fMYJd3CAOqzkl39En5QcgI9zNKoWfjBGttN2zhAkTMZSFCwuPt5XpG5f 5B+4OBkF8aT4HkZwe0FMZLWBi8J16R4PQr4kOdlmdy1v7dRWzi6zDspDA2uk8u/Mh9jx jTNJKRiNi5v8olF/WmGQXvVX51olKUOfjcxeZ5RJut5pxhSyOIYhTU8Na1OUUO20xwS0 RNUltcMCeZLL+ClScdsCwP39xApMr86dFyz8ZiY0w/WyYsErRRQvavYxCm+LvtvoR3SX tCNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nPG7dYim; 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 v9si8501583edw.524.2021.09.24.02.06.35; Fri, 24 Sep 2021 02:06:36 -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=nPG7dYim; 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 E1D5668A5DE; Fri, 24 Sep 2021 12:06:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8018688162 for ; Fri, 24 Sep 2021 12:06:08 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id k24so9265369pgh.8 for ; Fri, 24 Sep 2021 02:06:08 -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=TKea38c5rHCLzT2DaF6di5aXWfS8zGTA5HB4aq6qMRk=; b=nPG7dYimu+/urlGET3eBNyiPd8kRuvUUOklhA2T3+N6iup9i7JlOlttpAS/kOn6kul nxzwwtaXkhAP4HvwtIg/gCQ7UI3aXWzaaiU2AGrTDlEZLi0Iklw45oTuuu8+NwJ1qmCc yhycgwiPIC0DF3KsQ1Li3xN1QNKqQBskkxRBQDK0hpxvWjlix/se2DPeqqb2KS0c+E58 hFdjGMk2PDlwZoxk1sGk+rxpl64ak9LUwlUSTxmcTc0zSXlAGjot6lXXrCV9JeJLFrNp BSwfO2/cmyRDhSvKLw88dfxXbhWgNk8ZgEEJeRoR+MeDXwaNX2PB9rhB2dGUoc+1ekR6 7BQQ== 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=TKea38c5rHCLzT2DaF6di5aXWfS8zGTA5HB4aq6qMRk=; b=iFUGTc6TtFn+WKBe4jIXM3hmsNL8rE1dfZEXL9Qx5Xo4C2auzbJgpJMhc3Vupq+apA foyIdpNWszqXcLRZr2/N3zDaUXyfv0cI2T63wr+RLQzaJwyl/7EEDaAxkCoVDGvkhJkQ +ZS89f1hkHJHYnTEKXgOAMKKsVN0JzZGsHjWqJCT5AudyD8jUzg3/HQWPN8WtVWgpOl0 yCkcORgMpVhglQGN4hBSoMEmpcqVEDkMEFeb5LA6E+a7DEvduAu47BRQae4xQHJhy1lX F/hy4nacB6PvG5FbTCYedyYIAl4SQKYDAoOuf7Uv6hP4VjwylDgMfPGrHqmx2ZGY5ogq CODg== X-Gm-Message-State: AOAM533OoGg3zc2EBLkQyy86qByNgnZ29MGvSgGMlHlheUdTCz6s5Bxp PZ793hU7A7Lo1Jz5BJKr4l1UWGnC4oIhiA== X-Received: by 2002:a62:7985:0:b0:437:36f1:d0df with SMTP id u127-20020a627985000000b0043736f1d0dfmr9000888pfc.52.1632474366861; Fri, 24 Sep 2021 02:06:06 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id s2sm8029279pfe.215.2021.09.24.02.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:06:06 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 17:04:36 +0800 Message-Id: <20210924090438.11954-3-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924090438.11954-1-cyph1984@gmail.com> References: <20210924090438.11954-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: rIJhXwgecUfa Use spare packet allocated in DecodeSimpleContext to handle packet submission into ffmmal_add_packet. Signed-off-by: Ho Ming Shun --- libavcodec/mmaldec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index d4788b33f3..a8a568d239 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -781,10 +781,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); @@ -795,9 +797,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 09:04: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: 30547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1292024iob; Fri, 24 Sep 2021 02:06:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQFKjngCyrW5cJ2p2SqDEPhGqCPHSvCfsM2UXZYNA876BwQaVgsebpocp9SMA3DjRgVVwq X-Received: by 2002:a17:906:95d7:: with SMTP id n23mr9609215ejy.479.1632474407154; Fri, 24 Sep 2021 02:06:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632474407; cv=none; d=google.com; s=arc-20160816; b=KEmnSOHHVuDUZUVx6QMN54eBZlgUTunKLkXN0TyMYYzYTnCVVzLEKyxc0FhGlejrFB 0xYfYNRpv0w+CE+87EySVvwcbCDlQx2ashqZGGhB4xwuXpaL/hHoyRmzeTa0Njf3heA3 yOTebGdy835vXoyGN1MQ633McguDPN+1OJKEHZ24XwWg0Wiz8xx8jn7twiKAIjw21DuX LDC6UT8EitwmX0ei5rPdY5Nb4KCg/996iKcXQ/tgA0i1xR1khUyH1dxwHfVthmSBCYXj EkrYtz8EEl1KtHuG5ZrKrcNRKdX1aA1paum6+ohis/Jja6BjPOCV6cpMMPypSB9kGtoL 4RZg== 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=R0sZpwfSHvARayBBukmyjqQ5x2OKI/8H2Fa+c8OM0gk=; b=tiZ6w6Q1bFx7cusm1EeZQ+ko9UWmjINkdXMhCbMvUCofmrcCYuBtSbSHUvcQjWRiJB vcI0SVf+jQ+ZAU27CatpTdWct0PFLm61Kxop46EiAfuXQJcYy57XAHhVcJ+z7oI9TNoq xqAnrfjG8Ral9L87vHfROgnyNsxOrAcDnEX7oghMiqvdHw80C5iliDMSePiu2lDvmA3X eENey+zWHLAYkz1OZs3Vc/zN+QG7EPXufLjL7DwvJ4XBnHAcFbDgRbm59KzVRNWHwAsG 6EFnJfej/2FpoD0VLIRYmUwmChmV1AExXDL7UKY7FIWIWkMybNRL4oyRYMMi25f3YHVq TA2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Fcd775je; 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 s7si8543543ejs.402.2021.09.24.02.06.46; Fri, 24 Sep 2021 02:06: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=Fcd775je; 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 2B76E68A62F; Fri, 24 Sep 2021 12:06:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23FD368078A for ; Fri, 24 Sep 2021 12:06:10 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id k26so3747654pfi.5 for ; Fri, 24 Sep 2021 02:06:10 -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=EdlzZZ+wkuMBq2ZC380xHEvUeZzdAIQpQe3CSXPCyls=; b=Fcd775jeQKMUFiTMetQe4kgfPUHyJ9RE87cWI7BOul0WRILXFH52i33Qxk376NvAti /cY53FM6Hk+h2H5H2eO/xKleaTNc+etSUmv1YRJPNXfTYujCFJYyWIlNii/gcIAxic7Y aoBbBFOUp5sYFTVwqrUpi+/NB3i1/0QOtmE7+IsIlho83vylPtvhzjFZI+jyV55Xz3iT GMtPieUtJ1OmJlE1xTqg95mIAUdX9RYDWNV9dEQcVAa7H/4KxvIl514NXmbSGPXjKhXX n2XZUwQf6zRVPt0H1J8ZL8wb9de9vEQL4Bw3o/3DTuqOAsajqaffsEPp/JvZRSB3QA/r UGFg== 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=EdlzZZ+wkuMBq2ZC380xHEvUeZzdAIQpQe3CSXPCyls=; b=PMIURPU0jg92bPM188cLaABkEfYN+wU1GYq2ONMbFmrMRiLUDhfUHdR2AGZxVhqxQf tMAI2/cSo2aqoKnVtucwdoaW0t9rl20As98yosIVEVizhOhF3m1ddpInCPqo7N6uqDQd TQyHVaMnDD5n2h4ztXw3rtXZE27hQcnZF5FRtvgt9owRl+a996goPH805yy09RJyi7ku BSiBYUcvd02SvVBwnU2fxjCgXRUf0JpVcFxNtQjRy20ipyEHVT6MEDgTsmFoK8NgNZtw 7ZlICieV2M+rFTZrbGrVqY+6zW1N0vn1MZFrD0wDqpTPpHrS3XfUPoAdZqcCuIRrwYvf leaA== X-Gm-Message-State: AOAM531Dh7crSw92mEbMIG+ZsFTJRxaVeAN+ZY9br5bsMBktnx8iPBIu Q2BigofdBwVl3wKsR98AfCR3dBleXDKfEQ== X-Received: by 2002:a63:7d05:: with SMTP id y5mr2977699pgc.80.1632474368301; Fri, 24 Sep 2021 02:06:08 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id s2sm8029279pfe.215.2021.09.24.02.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:06:08 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 17:04:37 +0800 Message-Id: <20210924090438.11954-4-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924090438.11954-1-cyph1984@gmail.com> References: <20210924090438.11954-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: Am6oPUHsrRpH 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. Signed-off-by: Ho Ming Shun --- libavcodec/mmaldec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index a8a568d239..6dbb991ae1 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -788,12 +788,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 09:04: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: 30549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1292168iob; Fri, 24 Sep 2021 02:06:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzV0Aa0wP8/bLIpFC6x66gxvqwwpZ5qxxqKao/VXuRNxOYQ5xRzuX2umG8kkuup7T9jxyBl X-Received: by 2002:aa7:c945:: with SMTP id h5mr3766079edt.350.1632474419191; Fri, 24 Sep 2021 02:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632474419; cv=none; d=google.com; s=arc-20160816; b=wpLA1T1tg7l+UsdGqDdXXA2+tvmXXjYG5vDDq7YxU5ZjV2t2+69Fu+RuZ5xLRpWzbB RTTD1+FQlH3uOaE9SC0of5WU51s0ird0knxT64rDzbye7EPhKm5OvFK6YRoUCEtu2JR5 AfzuvcpDTu8gNpcnM5wmdKVhxp2rEVp5i9azmDnr3lIYgpmpEjRdWvTVlxosK/vHw+zJ /J9jEYxgmNuQocOEVdp4SUYo7TwYkdwXzuAtgpKpgKIR7VxwENUt3S/pR8lYsmQJSwFj 4JB6WTOg3Z/MwHxZ2Z2CgwIYY0NCim+wiL8Xcaw1C4r+aqEZoTRnv4KpJ0R2fY8J2nrc n+Pg== 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=aaORd+IyJv371rouiETcac6mjh2ijuULn6eZEBCjqq4=; b=OnTm6Q9nps9ND93R5ZKi8VQquntWM3TIZV4tCIXBpZvH9FPePgUEPp8ZVAwjEpe8Mp 2bMDApuaXQm71ns2148Izy7QHZsBof34haoZrkRvwjSpc0NHBtd2LzzhEi+wZEjJQz1x yYJG6sS/tf+FDPcz5cfAPWOOYe+00+ZolNKuaZAXuG6TlXjw+BnJ58KcAWTY0ZJ20Bxz XyHfAdleI4+oxsnUoMZmtgqra9QGfXb2l+gMfhvBjy5bl+FsanJSwsrgtOhrTa1pcfen vPEIPPD2yIFXv2KyDRQG5dS4zLfLYgS5KDwDdcSffVsD1/twfP4Bm+bjiBKjRB7TO8hV /uFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c6bIsBaF; 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 my12si8253561ejc.756.2021.09.24.02.06.58; Fri, 24 Sep 2021 02:06:59 -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=c6bIsBaF; 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 4961F68A64B; Fri, 24 Sep 2021 12:06:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CAC1689954 for ; Fri, 24 Sep 2021 12:06:11 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id x191so2328377pgd.9 for ; Fri, 24 Sep 2021 02:06:11 -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=YWNyERbGBJSdA3zqBjlIVJFH52fN8GTTzn0S3d0thSY=; b=c6bIsBaF6cLwz888Y0uAEmcSh0EBEAVxu5hQ5TCtYiSzxaEpvjzTAwLlZvFqMA2k3E lzTzMoWKZzr6mAF/X2BMUD+k+EeFsVcFRYO1cTWfepJWsbECOIVv+uormLHRt5+XncbB FkamuYmC7uwDN7vP0SaWV3ZbqQuWSV3K04loUvhb9vdjFPEvuPZ6icKAWKm965zQivCr cVtxXEya6crvvPAW9/sa6fDCV6R98l7mjGDssP3sMYIyZURujqUZ/2Jp+PS15sCIFbyB qb09WQd1tM6PgLwC8fyYedQZs+tjXBnTHj6C47DIzGM4iw6YcuDanGUXta57tNR0i6TA BmFQ== 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=YWNyERbGBJSdA3zqBjlIVJFH52fN8GTTzn0S3d0thSY=; b=sFt3j705zM+Y0JVOyuN5OTyemP0F5SVwYZFu4faxvpIaJIw7h+WiA7SAxmfBB0ruKP erd637n+iz+J4DEWACj9yXLaYIgnHvGgNMvL7YwdRiaaKXDIKi8oPWYjKzttcbu7G+uK IaZXBSNCyR2A7dfk5RvFEZx5MHQYPuSS2wHSOuGVlweJaKsxk0pAPJnVtrA8iX5un5L9 yR+RoOIghIi4XDSBI25JuL8rkW0iTL6iQ/iI2E63iWKPota80P5VDI0oU8DDXAKNPPI3 A8CHuB7ZOkWUPGL2BqPxjjosD242yoIVkmSm3H/1Ssfub0JwYkP4jL+ltfeCTRh05MVT yoHg== X-Gm-Message-State: AOAM531xQnuO3zVMrlZIxE6Rcf2xSjw64hjV+/2G29hXYL0nbOfxwFVL V2iTamtRJ8v9C1ODFvWueSWs4Ylv/VKxRQ== X-Received: by 2002:a05:6a00:130c:b0:444:f9d4:d800 with SMTP id j12-20020a056a00130c00b00444f9d4d800mr9203770pfu.38.1632474369543; Fri, 24 Sep 2021 02:06:09 -0700 (PDT) Received: from localhost.localdomain ([103.252.202.177]) by smtp.gmail.com with ESMTPSA id s2sm8029279pfe.215.2021.09.24.02.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:06:09 -0700 (PDT) From: Ho Ming Shun To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 17:04:38 +0800 Message-Id: <20210924090438.11954-5-cyph1984@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924090438.11954-1-cyph1984@gmail.com> References: <20210924090438.11954-1-cyph1984@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: to79inaxK5/w 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 6dbb991ae1..ff8772b0a6 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); }