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 A830145A28 for ; Fri, 10 Mar 2023 12:18:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FBB868BE10; Fri, 10 Mar 2023 14:18:28 +0200 (EET) Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3FCD68A3B9 for ; Fri, 10 Mar 2023 14:18:21 +0200 (EET) Received: by mail-ot1-f47.google.com with SMTP id g6-20020a056830308600b0068d4b30536aso2777848ots.9 for ; Fri, 10 Mar 2023 04:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678450700; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=QUzTqnMk1/Mmsk91XcvghvYubka8lJlTKar+jImafUY=; b=UlGgQGxl1QAYRnto8vzpV1/TIDxIQFKyYr8MgPdRYtwBbFwwBigVBu9OLpMpaq3TcD taVePWqcYXk7/Frj4cvutFpE5w0KM5K9NYzucSiI8cjdWdKLDnl4POZ/3z9DJSkj6iiv pdGaRkQIWgmzrLp/5AnY3vrGNDcjSdcU9QqIcbWoz73SccAIlT/hLusyB0pHs1MIzNOh eHnght9YBjci7CBz20tUKVaLWicXohWavqJulqrBBVIaayibztag2f4TUIyiFBK6Ru7f 4+S7DQTEf+0L82kzwNSOthHN+rqr7FVe7B6ngaapBUG+YH2QDJO+i519sy02WO4rDeb+ zBpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678450700; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QUzTqnMk1/Mmsk91XcvghvYubka8lJlTKar+jImafUY=; b=tCYim8Xrh7SULdsN7FWJBl0VHUPX6k5pPQSwk7n6f68eLX/Hq6JjIbKkw8kOR3TIyD I9HzhQyZHc5h6xNMqXuNPnpHGN45MdJdiK6Gz2KpKJ877puFVN+3oeWL1lYp6uBcBl0I tdGJdJ1oWkvzil8vrp3cpT6OA+fxGOm/5l24gClr8bqT7V13Ld5266xEG9v9+yt4pq1F ykk/yQziyYV/gVzdF0bPRUH19Nf/ING1INqYaFjUmg0DF7fvjYxUirddE5wunhUe66QA kRO6GmLQMnyRgTl0AAuR7HQHfMhhhLqDuvcG98AcHf8u9SEIUUx/HAvDMvpfiu9Q4/Nt Z8lA== X-Gm-Message-State: AO0yUKUfM+y5w9cG6mBzKesMTbkOJ0G16s6iB2PkLmwL/ZIlWwx5Ob10 kOeIVurM7OmB7bJfCiw5fDI8l87CxQA= X-Google-Smtp-Source: AK7set9i76YdTh8inixJOAyJjuQLI+0wgS201n7GzBAFoH5PlaswieUHB6zA42VxrenbZ8YsWXeAnw== X-Received: by 2002:a05:6830:3101:b0:690:dcaa:727b with SMTP id b1-20020a056830310100b00690dcaa727bmr14498365ots.27.1678450700292; Fri, 10 Mar 2023 04:18:20 -0800 (PST) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m19-20020a9d6093000000b0068be5ad8044sm875582otj.4.2023.03.10.04.18.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Mar 2023 04:18:19 -0800 (PST) Message-ID: <38e8f429-9da3-fe23-7514-e9d6aa7f32bf@gmail.com> Date: Fri, 10 Mar 2023 09:18:24 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230310115635.13639-1-anton@khirnov.net> <20230310115635.13639-6-anton@khirnov.net> From: James Almer In-Reply-To: <20230310115635.13639-6-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 6/6] lavu/frame: deprecate AVFrame.pkt_{pos, size} 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 3/10/2023 8:56 AM, Anton Khirnov wrote: > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index d1ba7f167f..ed937a3055 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -287,8 +287,12 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, > if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) > frame->pkt_dts = pkt->dts; > if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { > +#if FF_API_FRAME_PKT > +FF_DISABLE_DEPRECATION_WARNINGS > if(!avctx->has_b_frames) > frame->pkt_pos = pkt->pos; > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > //FIXME these should be under if(!avctx->has_b_frames) > /* get_buffer is supposed to set frame parameters */ > if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) { > @@ -1312,9 +1316,13 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, > }; > > frame->pts = pkt->pts; > - frame->pkt_pos = pkt->pos; > frame->duration = pkt->duration; > +#if FF_API_FRAME_PKT > +FF_DISABLE_DEPRECATION_WARNINGS > + frame->pkt_pos = pkt->pos; > frame->pkt_size = pkt->size; > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > > for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { > size_t size; > @@ -1355,7 +1363,11 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) > int ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); > if (ret < 0) > return ret; > +#if FF_API_FRAME_PKT > +FF_DISABLE_DEPRECATION_WARNINGS > frame->pkt_size = pkt->stream_index; The only remaining use of last_pkt_props->stream_index is in decode_simple_internal() where it subtracts the amount of bytes consumed from it, so maybe it should be wrapped too? > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > } > #if FF_API_REORDERED_OPAQUE > FF_DISABLE_DEPRECATION_WARNINGS _______________________________________________ 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".