From patchwork Thu Apr 13 16:29:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41173 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp527684pzb; Fri, 14 Apr 2023 07:04:35 -0700 (PDT) X-Google-Smtp-Source: AKy350axqeXqsgY3C3JPT8GifPWDW0Iq0mQAmt9lk2jxriuq+mt+6XkvNXzxBTzAwtMJbZdYvwQH X-Received: by 2002:a05:6402:48b:b0:506:73d5:5e0f with SMTP id k11-20020a056402048b00b0050673d55e0fmr4991297edv.30.1681481075281; Fri, 14 Apr 2023 07:04:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681481075; cv=none; d=google.com; s=arc-20160816; b=vrxSIiIXJfFfvOXItliCCSB7BhQQCxsEAMi99/N6FwjRhnqaSYVIZ9K97oSK6Wz2Br vCSP+SuDOeA5FbMh4I25CB/Y+gxtm6nkkBA0YPeuHKQ5WE+h6GbhajqXpHSmLe0JQVY1 dee0s7szv26Ajx9NYLdyhDLgkLAZ3ujorA3gveBu2Ohvf7nBCZJvZOj7ro2s3bkPqNQo SSe2lDtmVJpI7mW1Zt7ZScY5p9vWWT7WQA9q4qAFU7hyg3HRSDiz7SuUbCXX2Pg3cFXU iwyyVikCnti6/vEaVamT18cVSiXelZZcEozdV9qw1mJmfnie//CQDu5JohC44aS5ZfBa 3vCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=VilmlAL96H+uYSSzRHz89iFI0CZ0NVIS6CAf26DdXHU=; b=R91VBtcS8/hrjg1iMh7bKWFfkq0J/oBUFhr5p48eEHJol/7Wq/A8aQ7qi+wB3tYuYX S0RokLKMncYPMEmWGZgnJKU8BIXSQTS8D+ABxtrSSHb/CW93RmF9XPcoDKj452fqZjol pvlQWpsK3wypw0LbmrRFbR8C3Njhm/IwQkjjkhVx+D7fx/6+vb35T2Yytuci9uMOBBDY S9sa6FMdWKhr9svlJsFX2QEVvlhizpUn0Mkm3uoCGD3u3yKpexXjCSiBIFQQUizCW/Lb 1eTkuy6CcusWf+pOxkEwuRIckwtkJqNFjWwNHN6YEW4XjaBiVEWN3I/SLoxos+0P3xYv ZMJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=kaRv6ZDl; 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 q21-20020a056402041500b004ab9fed6acesi4442241edv.384.2023.04.14.07.04.33; Fri, 14 Apr 2023 07:04:35 -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=20221208 header.b=kaRv6ZDl; 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 D94D468087A; Fri, 14 Apr 2023 17:04:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33E8268087A for ; Fri, 14 Apr 2023 17:04:23 +0300 (EEST) Received: by mail-io1-f42.google.com with SMTP id e18so2693553iow.3 for ; Fri, 14 Apr 2023 07:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681481061; x=1684073061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YTJfXhj3rgfun4PqvcL3F+DtFXoxz4TRJpXZ4vRc1xg=; b=kaRv6ZDlS+2aIgxiOj5gqo8tIzCK/tX9RVrFTjpuhlHLiO+wPfWpr27ETa/mynTKNc Ho6w2F7M2+gPluMqlekgclF/43BfHgLY3MTK5NuTEaDS1CSIkLMcY0yRdgN1a2KTOHGe zG7Zwn1Un2CrSBTdTKtxXghbXrYg4rnC0gX3mcHrbzFcL5LvODxKMZdouwzmY6uDpv6L L6CR1YSf2ZLh+f6Kq85dMRTxUOhAQLIUZofBQ7FA2PUTO9LIoQo4MPbmxWoG7WOdOj51 gJbQeM6lb1XhazIcMt7uGyWC/acuinuHMfudaKNVMRSb0t41IFULSVQsxh0v3Lr06UTO H7DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681481061; x=1684073061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YTJfXhj3rgfun4PqvcL3F+DtFXoxz4TRJpXZ4vRc1xg=; b=VcbvRjBlOTej2KRWMb8zzWqSOt5Y7P6tVAnx6tkgL2MV+t3GvAE5+RT4PPtmD/g5b2 QTLyEC1vcvTL0OeSE0wnWCX1orbqqxjpIMHiJH58TCTKrbjk1b/fRXxM4yvRrN/63S7u ZGtOlB/2PYSeqgB4j22XRcfJhVQe2yp51bz6sO/SEjtLF1lcGAjEQWuf7mobYuUDOcVj jB/MBp7o0jzUDsreZHF2ImLy2H64/V7NMduUGh7rnxxqdphruC1DBnbpk24mZ6J3TdLO L7odCGdeLR/FDIRz+T+rOAbi4pQlepj/6BDgx67UpjedJ8BUVdeCq4lFu2akqyhECk1t fsoA== X-Gm-Message-State: AAQBX9emelGIt69UW+UWCJfdN7eiSsN6EqMGpi/LZkQSVuJFnhJELaMa GQtju4j1www7mPE14+rNL6PoR7h3tsI= X-Received: by 2002:a05:6870:6392:b0:177:9040:d24b with SMTP id t18-20020a056870639200b001779040d24bmr2018831oap.32.1681403401126; Thu, 13 Apr 2023 09:30:01 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o19-20020a9d5c13000000b006a3f8f7b686sm852589otk.28.2023.04.13.09.30.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 09:30:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 13:29:40 -0300 Message-Id: <20230413162940.61095-5-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230413162940.61095-1-jamrial@gmail.com> References: <20230413162940.61095-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avutil/frame: deprecate key_frame 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u7i3cwy8ojsS Signed-off-by: James Almer --- libavcodec/decode.c | 4 ++++ libavcodec/encode.c | 4 ++++ libavfilter/buffersrc.c | 4 ++++ libavfilter/vf_coreimage.m | 2 ++ libavfilter/vsrc_gradients.c | 5 +++++ libavfilter/vsrc_testsrc.c | 4 ++++ libavutil/frame.c | 10 +++++++++- libavutil/frame.h | 5 +++++ libavutil/version.h | 1 + 9 files changed, 38 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index edc6a6acba..cf7c4c3889 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -572,7 +572,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) if (!ret) { if (avctx->codec_type != AVMEDIA_TYPE_VIDEO) frame->flags |= AV_FRAME_FLAG_KEY; +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY); +FF_ENABLE_DEPRECATION_WARNINGS +#endif frame->best_effort_timestamp = guess_correct_pts(avctx, frame->pts, frame->pkt_dts); diff --git a/libavcodec/encode.c b/libavcodec/encode.c index d3c0bf6aad..bceb3b50b7 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -192,8 +192,12 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame) av_frame_move_ref(frame, avci->buffer_frame); +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS if (frame->key_frame) frame->flags |= AV_FRAME_FLAG_KEY; +FF_ENABLE_DEPRECATION_WARNINGS +#endif return 0; } diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index a81c331cd5..0ccab4cf3f 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -247,8 +247,12 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS if (frame->key_frame) frame->flags |= AV_FRAME_FLAG_KEY; +FF_ENABLE_DEPRECATION_WARNINGS +#endif ret = ff_filter_frame(ctx->outputs[0], copy); if (ret < 0) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index ea43aad275..5db0d39264 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -301,7 +301,9 @@ static int request_frame(AVFilterLink *link) frame->pts = ctx->pts; frame->duration = 1; +#if FF_API_FRAME_KEY frame->key_frame = 1; +#endif frame->flags |= AV_FRAME_FLAG_KEY; frame->interlaced_frame = 0; frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavfilter/vsrc_gradients.c b/libavfilter/vsrc_gradients.c index 39e9e226ee..b8d59650d0 100644 --- a/libavfilter/vsrc_gradients.c +++ b/libavfilter/vsrc_gradients.c @@ -397,7 +397,12 @@ static int activate(AVFilterContext *ctx) if (!frame) return AVERROR(ENOMEM); +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS frame->key_frame = 1; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + frame->flags |= AV_FRAME_FLAG_KEY; frame->interlaced_frame = 0; frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 7fb1ef9718..5380c78692 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -184,7 +184,11 @@ static int activate(AVFilterContext *ctx) return AVERROR(ENOMEM); frame->pts = test->pts; frame->duration = 1; +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS frame->key_frame = 1; +FF_ENABLE_DEPRECATION_WARNINGS +#endif frame->flags |= AV_FRAME_FLAG_KEY; frame->interlaced_frame = 0; frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavutil/frame.c b/libavutil/frame.c index c905e8d611..87c7039d50 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -55,7 +55,11 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif frame->time_base = (AVRational){ 0, 1 }; - frame->key_frame = 1; +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS + frame->key_frame = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif frame->sample_aspect_ratio = (AVRational){ 0, 1 }; frame->format = -1; /* unknown */ frame->extended_data = frame->data; @@ -265,7 +269,11 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { int ret; +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS dst->key_frame = src->key_frame; +FF_ENABLE_DEPRECATION_WARNINGS +#endif dst->pict_type = src->pict_type; dst->sample_aspect_ratio = src->sample_aspect_ratio; dst->crop_top = src->crop_top; diff --git a/libavutil/frame.h b/libavutil/frame.h index 895e06bbd7..353079fe51 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -416,10 +416,15 @@ typedef struct AVFrame { */ int format; +#if FF_API_FRAME_KEY /** * 1 -> keyframe, 0-> not + * + * @deprecated Use AV_FRAME_FLAG_KEY instead */ + attribute_deprecated int key_frame; +#endif /** * Picture type of the frame. diff --git a/libavutil/version.h b/libavutil/version.h index 40f92af055..406ba2a619 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -115,6 +115,7 @@ #define FF_API_FRAME_PICTURE_NUMBER (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 59) /** * @}