From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 81189423B9 for ; Thu, 14 Apr 2022 16:39:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE50068B334; Thu, 14 Apr 2022 19:39:56 +0300 (EEST) Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE4FE68B1DB for ; Thu, 14 Apr 2022 19:39:50 +0300 (EEST) Received: by mail-ot1-f49.google.com with SMTP id m16-20020a9d73d0000000b005f8edc0599eso2050956otk.11 for ; Thu, 14 Apr 2022 09:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=KZMBEbOKJPHd/UEEhKc6vEVBBeb/iGCa0d9tC1bGXYg=; b=WmUxA4cItExNvec1Dh9Rops94dZOOQbI3SuNCIU97UsDIyK/tGSzlkj+6MJ/+ThCIp 0daYlNqq8eLgNYicInbAcPcJDYn4Ku8O45zanpJ680b8LmgREs3UbIwXKytxlszJv6n/ g7ejPCa3vIuFtldgZSC5LhSFEuM6y0te4wroxN4nZpfHb4Kj1Vak5zJODoresXHRJtvi x1ehB/nO54XMejOjntJpvAs+6Q8JCZYL0t1FfpVRp5ZKb0op8ow0gEF9qTjxSBYug5Kg lBvZR1uSpATxkGgNLL4FZLHe12+XK1xq+ItXt24uj8cTQPqRxlxdSbgoxB6/8BYwKm0M g/Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=KZMBEbOKJPHd/UEEhKc6vEVBBeb/iGCa0d9tC1bGXYg=; b=H+fM28vm7DtrtmKl2P6+ggtPrChc51IZX7g4oxDxKcC2zSgtmVtNezFN2qENoSucJk 2PdulzN0XjUacgyA0IU6ns1FILE7EZg+wWbrZ5U88Ya3PivqIQ0LXcHXDXKt8gPI/j6B jvLXODWUCfys/6ROZkuGV8Tviq1lIVmUbnReXD9H47kkcqqrzjVYP3PP2zMun+fASOb3 F7Pe65xdIS4k1T3YQTGrurgCdoEyU/xz2GXW/b2VB1883LNdmd0yIBx/HTYDMLFlrfzG mKcKeZGXjHoaW9tpgVPxG73u4x/YXr3t649Tsy6BpSnpQHY1QBQVU/jvuiil0aBk/1sX EFUw== X-Gm-Message-State: AOAM5314EpnQok10pgJZaUCKdKUwTDGpV8FFjP2UIDTDVf0qalVNfRI+ 7lCSbTIkLefwrHeQ0icPTYToeLVUJuk= X-Google-Smtp-Source: ABdhPJwOOyrlcPuUbV3AegBro1ujrsqHg4pcLBaC41y0bdld190bQ8S6hJBpePZrOVsk4FTgf3EngQ== X-Received: by 2002:a05:6830:2047:b0:5ea:2771:803 with SMTP id f7-20020a056830204700b005ea27710803mr1253984otp.362.1649954388746; Thu, 14 Apr 2022 09:39:48 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id s65-20020acac244000000b002ef4ee8c800sm192359oif.13.2022.04.14.09.39.47 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 Apr 2022 09:39:48 -0700 (PDT) Message-ID: Date: Thu, 14 Apr 2022 13:39:46 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 2/5] avcodec/mjpegdec: Don't create unnecessary AVFrame reference 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/14/2022 12:57 PM, Andreas Rheinhardt wrote: > MJPEG is an intra-codec, so it makes no sense to keep the reference. > It is basically unused lateron anyway. Wouldn't this mean you can remove the AV_GET_BUFFER_FLAG_REF flag from the ff_get_buffer() call? > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mjpegdec.c | 45 +++++++++++++++++++++---------------------- > 1 file changed, 22 insertions(+), 23 deletions(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index 0e76bf4c26..939dedce33 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -2589,8 +2589,7 @@ eoi_parser: > > av_freep(&s->hwaccel_picture_private); > } > - if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0) > - return ret; > + av_frame_move_ref(frame, s->picture_ptr); > s->got_picture = 0; > > frame->pkt_dts = s->pkt->dts; > @@ -2675,9 +2674,9 @@ the_end: > if (ret) > return ret; > > - av_assert0(s->nb_components == av_pix_fmt_count_planes(s->picture_ptr->format)); > + av_assert0(s->nb_components == av_pix_fmt_count_planes(frame->format)); > for (p = 0; pnb_components; p++) { > - uint8_t *line = s->picture_ptr->data[p]; > + uint8_t *line = frame->data[p]; > int w = s->width; > int h = s->height; > if (!s->upscale_h[p]) > @@ -2737,7 +2736,7 @@ the_end: > if (ret) > return ret; > > - av_assert0(s->nb_components == av_pix_fmt_count_planes(s->picture_ptr->format)); > + av_assert0(s->nb_components == av_pix_fmt_count_planes(frame->format)); > for (p = 0; p < s->nb_components; p++) { > uint8_t *dst; > int w = s->width; > @@ -2748,10 +2747,10 @@ the_end: > w = AV_CEIL_RSHIFT(w, hshift); > h = AV_CEIL_RSHIFT(h, vshift); > } > - dst = &((uint8_t *)s->picture_ptr->data[p])[(h - 1) * s->linesize[p]]; > + dst = &frame->data[p][(h - 1) * s->linesize[p]]; > for (i = h - 1; i; i--) { > - uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[p])[i * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]]; > - uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[p])[(i + 1) * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]]; > + uint8_t *src1 = &frame->data[p][ i * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]]; > + uint8_t *src2 = &frame->data[p][(i + 1) * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]]; > if (s->upscale_v[p] != 2 && (src1 == src2 || i == h - 1)) { > memcpy(dst, src1, w); > } else { > @@ -2768,36 +2767,36 @@ the_end: > if (ret) > return ret; > > - av_assert0(s->nb_components == av_pix_fmt_count_planes(s->picture_ptr->format)); > + av_assert0(s->nb_components == av_pix_fmt_count_planes(frame->format)); > for (index=0; indexnb_components; index++) { > - uint8_t *dst = s->picture_ptr->data[index]; > - int w = s->picture_ptr->width; > - int h = s->picture_ptr->height; > + uint8_t *dst = frame->data[index]; > + int w = frame->width; > + int h = frame->height; > if(index && index<3){ > w = AV_CEIL_RSHIFT(w, hshift); > h = AV_CEIL_RSHIFT(h, vshift); > } > if(dst){ > - uint8_t *dst2 = dst + s->picture_ptr->linesize[index]*(h-1); > + uint8_t *dst2 = dst + frame->linesize[index]*(h-1); > for (i=0; i for (j=0; j FFSWAP(int, dst[j], dst2[j]); > - dst += s->picture_ptr->linesize[index]; > - dst2 -= s->picture_ptr->linesize[index]; > + dst += frame->linesize[index]; > + dst2 -= frame->linesize[index]; > } > } > } > } > if (s->adobe_transform == 0 && s->avctx->pix_fmt == AV_PIX_FMT_GBRAP) { > - int w = s->picture_ptr->width; > - int h = s->picture_ptr->height; > + int w = frame->width; > + int h = frame->height; > av_assert0(s->nb_components == 4); > for (i=0; i int j; > uint8_t *dst[4]; > for (index=0; index<4; index++) { > - dst[index] = s->picture_ptr->data[index] > - + s->picture_ptr->linesize[index]*i; > + dst[index] = frame->data[index] > + + frame->linesize[index]*i; > } > for (j=0; j int k = dst[3][j]; > @@ -2812,15 +2811,15 @@ the_end: > } > } > if (s->adobe_transform == 2 && s->avctx->pix_fmt == AV_PIX_FMT_YUVA444P) { > - int w = s->picture_ptr->width; > - int h = s->picture_ptr->height; > + int w = frame->width; > + int h = frame->height; > av_assert0(s->nb_components == 4); > for (i=0; i int j; > uint8_t *dst[4]; > for (index=0; index<4; index++) { > - dst[index] = s->picture_ptr->data[index] > - + s->picture_ptr->linesize[index]*i; > + dst[index] = frame->data[index] > + + frame->linesize[index]*i; > } > for (j=0; j int k = dst[3][j]; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".