From patchwork Mon Oct 23 14:13:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5658 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp6783134jah; Mon, 23 Oct 2017 07:14:15 -0700 (PDT) X-Received: by 10.223.171.241 with SMTP id s104mr12137353wrc.256.1508768055491; Mon, 23 Oct 2017 07:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508768055; cv=none; d=google.com; s=arc-20160816; b=haYu11TZjhEwUkb7Ln/WgERwPjPECYQgz+RZZ2Og26EslM7lMyidD7sRwTCinjKN8I iIdrMbz/bND9hrD99sVF6GFHui0mVAJwt/A3BNp7Hf8teQ8kXvlfuSokx4QUr+xX70hb 723nt/aa103rPft3j78FFfvK3+xF5MdTj0qWYUMvwLl9n3e7D2OdJRKZUAztqEvzKns4 GNgpuylHEP3IU11eYbvSy5EgU1NoeyuqzKt0MfwZp1Je/Gc8rk4Z84ueD7T1JlvCk8m5 mCkDjfrO/lFW15GreLQ+vWGsXRuM/fL3bzaNYVX4dVhk06H+qUC0KFDLfKy3WlVQ8rnL VF8g== 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=fxPzXVo12t18F9T86VSuj9QSjBoUlqnE7loB9ixxetk=; b=u3vwajRa/loh0fegVTUke3suXpMZFH2ag478sbIbYmIdJY/rpG8zHqsZFnhpYvmJWa 3wf/tO6GNfzhsboV+65w7HM6dxl/8ERg2AVZ4aID46MXFM2RpTNqN1gJXUmyXZkaLYAp SldyOMvKBWR1/XnKrMwQrY4Tc+XJxN2ymaDXnKO+KBI4PDbBvfs8kmRNiDn0/kRkX+LY TBbdMR/LJgqclDGKukPFhAmsxgew0sQxKzqhme0ZaT62yHYbnkHAwD8sj5QMxqJlyWsg TOxJo9BBSoAg4aygdTIYc/t8G0uygNSwC9whcmSwMnMxR9pzou+kXeKGEMY1jUAVD+nq fccw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=u96zqwes; 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 y16si3563823wmc.46.2017.10.23.07.14.14; Mon, 23 Oct 2017 07:14:15 -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=20161025 header.b=u96zqwes; 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 8046868A0F7; Mon, 23 Oct 2017 17:14:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5E63689DC6 for ; Mon, 23 Oct 2017 17:13:59 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id z19so26280739qtg.11 for ; Mon, 23 Oct 2017 07:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=i6uvmgW3ur+l394TUzpULNx+qgVfNJXQoaeeuQYK2ig=; b=u96zqwes9aLvLpqmRdzg2/N+f1xRu17xPy8ZQaoKsTVx1GoTxXIR5SgTE0fowE8ozV 1bEhXJHxNjX0RLEaeVR+rDHvza3J79Lc+5R2WPl9Bn4cfmSGjINAReAiQQCWYfJgg00p vlbNwVJmBIfAFB0Vv7p8cXksGO2R4lKsePlEsmeDNgjMv/6iFFXEORs4E5GoA7p1ERc9 5s+ryofpvNDkacE5dkzwTZBH1QRWxGl/qoFkHrXvXcJ3mgWsJREYgBarid9llgURu69B 3SVNe1aL1LYSMF9pzI1aBsQGvbKhcQCqHx1m9NF+ZSb10YeDppag4TBeAKP5l1dNvf+V cXcA== 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=i6uvmgW3ur+l394TUzpULNx+qgVfNJXQoaeeuQYK2ig=; b=TS/6QHei3KBq7yCr/MET2K5VyAcNWnxOK29egwquHcCZApl7LLg/EEl23qQdXT1pJ4 3KjRqjwEhZEqf21/HFi0l8op3f+qODeKbl29gnrPt4GtoKKnlbptu+c67EAbeFOoSvGa wSMXkN3A/cELj2Aq9hL78VGZ+zBz6q3FXUthilfOcaobb47MXFeQdqZP8Y8KJnAajzfk IldpxdvbMake1W3xZtzom9SqUi0oPhYjDYHKQmY9gIcbXtCfN7cWb/IRnQKgJ5TN6M8B TGdfATvbvBtQ4lLtSjDMcaS32RRLUiC8mOA/YnntbwNiuPkOQ+kJRj4el+QQcA7zz3+S fq0A== X-Gm-Message-State: AMCzsaWltCM274Mfb9XO919tlSiYw5dvj4Lu6/Hv+8bpviHlv8H2pNqX mmy1S6+rF9T1TRmUR6/Ez/94kg== X-Google-Smtp-Source: ABhQp+QmDQNJqCoUx0KNm8GXIm4ucHGkEORcRr1KGrZnXkT7AO3Hf2XVWgboji0BOyJf5wDX649i+g== X-Received: by 10.200.34.182 with SMTP id f51mr18793556qta.167.1508768045310; Mon, 23 Oct 2017 07:14:05 -0700 (PDT) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id 12sm4705614qkf.61.2017.10.23.07.14.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 07:14:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2017 11:13:52 -0300 Message-Id: <20171023141352.5032-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avutil/frame: deprecate getters and setters for AVFrame 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 --- libavutil/frame.c | 2 ++ libavutil/frame.h | 26 ++++++++++++++++++++++++++ libavutil/version.h | 3 +++ 3 files changed, 31 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 09dd98a6b5..982fbb5c81 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -31,6 +31,7 @@ static AVFrameSideData *frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, AVBufferRef *buf); +#if FF_API_FRAME_GET_SET MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) @@ -42,6 +43,7 @@ MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace) MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) +#endif #define CHECK_CHANNELS_CONSISTENCY(frame) \ av_assert2(!(frame)->channel_layout || \ diff --git a/libavutil/frame.h b/libavutil/frame.h index fef558ea2f..0c6aab1c02 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -565,36 +565,62 @@ typedef struct AVFrame { */ } AVFrame; +#if FF_API_FRAME_GET_SET /** * Accessors for some AVFrame fields. These used to be provided for ABI * compatibility, and do not need to be used anymore. */ +attribute_deprecated int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame); +attribute_deprecated void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val); +attribute_deprecated int64_t av_frame_get_pkt_duration (const AVFrame *frame); +attribute_deprecated void av_frame_set_pkt_duration (AVFrame *frame, int64_t val); +attribute_deprecated int64_t av_frame_get_pkt_pos (const AVFrame *frame); +attribute_deprecated void av_frame_set_pkt_pos (AVFrame *frame, int64_t val); +attribute_deprecated int64_t av_frame_get_channel_layout (const AVFrame *frame); +attribute_deprecated void av_frame_set_channel_layout (AVFrame *frame, int64_t val); +attribute_deprecated int av_frame_get_channels (const AVFrame *frame); +attribute_deprecated void av_frame_set_channels (AVFrame *frame, int val); +attribute_deprecated int av_frame_get_sample_rate (const AVFrame *frame); +attribute_deprecated void av_frame_set_sample_rate (AVFrame *frame, int val); +attribute_deprecated AVDictionary *av_frame_get_metadata (const AVFrame *frame); +attribute_deprecated void av_frame_set_metadata (AVFrame *frame, AVDictionary *val); +attribute_deprecated int av_frame_get_decode_error_flags (const AVFrame *frame); +attribute_deprecated void av_frame_set_decode_error_flags (AVFrame *frame, int val); +attribute_deprecated int av_frame_get_pkt_size(const AVFrame *frame); +attribute_deprecated void av_frame_set_pkt_size(AVFrame *frame, int val); #if FF_API_FRAME_QP +attribute_deprecated int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type); +attribute_deprecated int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type); #endif +attribute_deprecated enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame); +attribute_deprecated void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val); +attribute_deprecated enum AVColorRange av_frame_get_color_range(const AVFrame *frame); +attribute_deprecated void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); +#endif /** * Get the name of a colorspace. diff --git a/libavutil/version.h b/libavutil/version.h index aa56ad2fbd..7b4ae9beab 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -136,6 +136,9 @@ #ifndef FF_API_CRYPTO_SIZE_T #define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57) #endif +#ifndef FF_API_FRAME_GET_SET +#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57) +#endif /**