From patchwork Mon Nov 13 03:16:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6022 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1630755jah; Sun, 12 Nov 2017 19:17:01 -0800 (PST) X-Google-Smtp-Source: AGs4zMY1MK84CfG5J0VucoQne4FZW+/qaFoMvh/SNU656qLsRKGyS0dd4UN5i5X5/aAM2ShyFPQJ X-Received: by 10.223.176.8 with SMTP id f8mr6364824wra.80.1510543021104; Sun, 12 Nov 2017 19:17:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510543021; cv=none; d=google.com; s=arc-20160816; b=OiLHc+Nps+Oic5Hb+i/FzOQjiVvcu4gGJsejbkexnRntjjxQi+tZ9xzreFcmbj/pc4 tDdVhBApFwq5Kd+5Pd0EW4hZ/dTypj9tYagj9ZolB43rp69CGby8OvLHGKZud7Sba+2d AXNVIdQJHzBDz0zHkcsNdz7EKm+ujA8CyY6oZhYzKIwZ5Df0Gvlb/j7pUElRWk4ciEtH Wv7L2Y3Fny8/q8MV+pnytFeMvSOusJwqyuaqYNbZgh7Ezi9pYHF/urwmlbSrSr3oROK1 DyOEMIPbwd9iz+1+rFWChxqo/z+lud5s6XivACCF/Mx5GFoQpPd6QIsVt7kO+HJkP6hj bGnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=VXPizYNJmE1DznX0CpA4yWWKa8paN1j7KLnhyQXSM1A=; b=JrNBcdPn2jS6BwmPJ53pEVL/VUhaxqreUxHPCb/ujoXImP/PX7y4d/W8HOKSy/2dhk BLJnJ3JEWvARirdsixeIbpMGABcVr8kWBmHXfkILmLj8C6WmkjY4d1L2JZFstMWYA8D/ FVwVb3LkgUCz8l6YZcgSlDoWnf1QmScR4ijo5TtJ5XghubQmSHFBZr9JRIezs5Wc3gte Rb/J6cEXAM08pXb0xqpyjqY21YFuh2HW2evb+6GLluUOQm5OIuyOZxqoaMMFRrYg+m9l /pVi9MnRvUu1MjHEEOaVGRyTSjC9E2QFEY7yoorCi0+7HyvkAMhguAwuiHs+YSbeM2aP vnvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mTkN+xl2; 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=NONE 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 q14si13658286wrc.474.2017.11.12.19.17.00; Sun, 12 Nov 2017 19:17:01 -0800 (PST) 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=20161025 header.b=mTkN+xl2; 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=NONE 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 CAA2768A510; Mon, 13 Nov 2017 05:16:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5009768A50B for ; Mon, 13 Nov 2017 05:16:38 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id o6so18139621qkh.3 for ; Sun, 12 Nov 2017 19:16:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=rRZGnkljpEAT6/zve9G13npJ3fTVVguDC4VqAWX2RZc=; b=mTkN+xl28+AirSZoX3SXumTgU9JdXvp6nHY9/ibEARDtR8OcAgIWpdMSij1i/zs/sV Y5wSr2vb++dDvVtOfFBhUWJWbt9+M9r6kuoO7s2iM4rQCzJ3CdSWnAJ592/vn9wu8HF8 N+57dLNabZcCj5qsxEy9xgXukGMYiyPIHyjzpmBX0svm10Ph7++2kSdB65gafqDyKgFd 9jIyT650iMsoSFaP7u55uRm6895xUNsB7bA7Y+aOQjLR3Q+k5OmHcQRjB2gZ/zgUF17d 6FpBQO92Y7tbzJuobp47iFvWcw62tlZRzSqMJdPcE1LcJBd4QZ01aPgN1JLdBAwNFbQV kFcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=rRZGnkljpEAT6/zve9G13npJ3fTVVguDC4VqAWX2RZc=; b=nNfVxDe1+Hm5erdMd02HZVncbsrLgTkr3CyqFfVuw1zAaChH7M1RffquwzEj1XJ83M tAba9xMtYXoH6mbr4ZHyp4rMzw7nTTm3ITZCdoEmAzu/vllPvXEicM9DCsvkX1o9CcK3 IlLDMoeDk3y9EPcBiLtWztGoV4qMAmQoS30QY+RW14AkmWWS1cQHnvaI3RmfsrsJxtJ9 M4k/Ijz/rFEd5CBZy2ImmRvV6Y0QwDGS4TBtakzrrTQOdbiAd3nMzF/qvIO7laPLioe8 d0dkOasuVjTgBMNoGJhygtyPTSpS+OZPN5YLY0+JdYBBaPzfS5E0g1smhgzFzsT5EYaW xbfw== X-Gm-Message-State: AJaThX5vbdIiXdV2qXHKA0NLuKok3hUo+0LmRW5gaYsUYBlvQL8/NHcJ HQC2evOXptAk8iM3KwaFt+3DmA== X-Received: by 10.55.155.198 with SMTP id d189mr11421970qke.347.1510543011463; Sun, 12 Nov 2017 19:16:51 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id i13sm9986229qke.39.2017.11.12.19.16.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Nov 2017 19:16:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 00:16:06 -0300 Message-Id: <20171113031606.3604-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec: deprecate getters and setters for AVCodecContext and AVCodec fields X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The fields can be accessed directly, so these are not needed anymore. Signed-off-by: James Almer --- libavcodec/avcodec.h | 20 ++++++++++++++++++++ libavcodec/utils.c | 2 ++ libavcodec/version.h | 3 +++ 3 files changed, 25 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8c76c9f908..9fda5dc270 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3235,22 +3235,39 @@ typedef struct AVCodecContext { int apply_cropping; } AVCodecContext; +#if FF_API_CODEC_GET_SET +/** + * Accessors for some AVCodecContext fields. These used to be provided for ABI + * compatibility, and do not need to be used anymore. + */ +attribute_deprecated AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); +attribute_deprecated void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val); +attribute_deprecated const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx); +attribute_deprecated void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc); +attribute_deprecated unsigned av_codec_get_codec_properties(const AVCodecContext *avctx); +attribute_deprecated int av_codec_get_lowres(const AVCodecContext *avctx); +attribute_deprecated void av_codec_set_lowres(AVCodecContext *avctx, int val); +attribute_deprecated int av_codec_get_seek_preroll(const AVCodecContext *avctx); +attribute_deprecated void av_codec_set_seek_preroll(AVCodecContext *avctx, int val); +attribute_deprecated uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx); +attribute_deprecated void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val); +#endif /** * AVProfile. @@ -3387,7 +3404,10 @@ typedef struct AVCodec { const char *bsfs; } AVCodec; +#if FF_API_CODEC_GET_SET +attribute_deprecated int av_codec_get_max_lowres(const AVCodec *codec); +#endif struct MpegEncContext; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b3a578110b..e50de6e89b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -552,6 +552,7 @@ enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, return AV_PIX_FMT_NONE; } +#if FF_API_CODEC_GET_SET MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) @@ -567,6 +568,7 @@ int av_codec_get_max_lowres(const AVCodec *codec) { return codec->max_lowres; } +#endif int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec){ return !!(codec->caps_internal & FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM); diff --git a/libavcodec/version.h b/libavcodec/version.h index 9c17e5716d..f4872267f1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -120,6 +120,9 @@ #ifndef FF_API_GETCHROMA #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_CODEC_GET_SET +#define FF_API_CODEC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */