From patchwork Sun Jan 24 23:05:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25155 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2A46444B72A for ; Mon, 25 Jan 2021 01:06:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EAB06881D2; Mon, 25 Jan 2021 01:06:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D874680110 for ; Mon, 25 Jan 2021 01:06:40 +0200 (EET) Received: by mail-qt1-f171.google.com with SMTP id c12so8493227qtv.5 for ; Sun, 24 Jan 2021 15:06:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fmDYbdo0pi7hAJMMtDMZdYllPeKT98skJDV65x2Cd1M=; b=BwedOZ1nrdfc24U5LEtCWRDGBX6Wam9gigaUxgapEpvIRA9Psq38hDfUhbzdlkLUoN 01NEs99Wyo0XN/1wfkL8N7LLlZlKkOkJvy4kwAoS7eXPmdATGiuZYcMaQeh1Buq9Q2P8 GvOjXSWUAwug4X7iwtWy/vPQUZ+IkA/p7dNm3pGhXqZ7WzHS0E5dJVarkM9HWjPNEHC6 y1nYP9gtYnwrLFDTPDBbgQKW0+nYaHgApZ7KEqQuq6KgJyAvS9PtVuFJfFJpzJfX4hpY SUC3BUUOL6QvlcI+9QDzHG/jkvsa/Xtr63qR/rD4xiKfje9bj3ptczMAyNM2CSI1BOIl tvpw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fmDYbdo0pi7hAJMMtDMZdYllPeKT98skJDV65x2Cd1M=; b=pkVHlzlFkO8PbWL3hPcWULRaNoKIhROYtsNn+e5r/ULu4xw50YdLcboQAjYTFQgo+L 2SjpK9D0bXDaHmvI7hW0uUqLpRgfS5MbnzqZSSsa5Ebp5I6kQh3Q1DvZ+W7/f/x2KPba 6cwtBLIDpXxIP3BuCyk21DHymzJcZmTcCmKftY60Yy61Hzchrg8hAG4P7OdyjiJARVSI Q93ZyvVvrarx7KRfaB5LOjlIYU6liH7R9DqTUadnfaMRrgnPZqDCzt72hADcl2LM6s4h +asPGAx97h0IASnBh5pfgmCkPlIKEomKq2joqv3txi5tiALySdt8C/TbSchfeCFu/M4x MCoQ== X-Gm-Message-State: AOAM532N5CvUtCn8GnWH6goCBWkFZvp9TIIoRb8lVhH7k8OxiQfjFYUc TeYWj53/5fk8OIlD1TA0efE9/uzaQMpJRg== X-Google-Smtp-Source: ABdhPJxVRAgZsBeMswOp2iqScVP32ad3F0pd9gCHv5CPSiKBvb1gwaxQ6rqiwgJFl/C3zuNhd8AnZQ== X-Received: by 2002:aed:374a:: with SMTP id i68mr9449048qtb.81.1611529598760; Sun, 24 Jan 2021 15:06:38 -0800 (PST) Received: from localhost.localdomain ([191.83.212.133]) by smtp.gmail.com with ESMTPSA id i8sm10172861qtr.84.2021.01.24.15.06.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 15:06:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Jan 2021 20:05:52 -0300 Message-Id: <20210124230552.6842-2-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210124230552.6842-1-jamrial@gmail.com> References: <20210124230552.6842-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec: deprecate AVCodecContext.debug_mv 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's been unused for almost three years now. Signed-off-by: James Almer --- doc/APIchanges | 4 ++++ libavcodec/avcodec.h | 7 ++++--- libavcodec/pthread_frame.c | 4 ++++ libavcodec/version.h | 10 +++++----- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index bbf56a5385..51f97b2759 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-01-xx - xxxxxxxxxx - lavc 58.118.100 - avcodec.h + deprecate AVCodecContext.debug_mv, FF_DEBUG_VIS_MV_P_FOR, FF_DEBUG_VIS_MV_B_FOR, + FF_DEBUG_VIS_MV_B_BACK + 2021-01-11 - xxxxxxxxxx - lavc 58.116.100 - avcodec.h Add FF_PROFILE_VVC_MAIN_10 and FF_PROFILE_VVC_MAIN_10_444. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dc8738c819..eafc2e84e3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2141,15 +2141,16 @@ typedef struct AVCodecContext { */ int seek_preroll; +#if FF_API_DEBUG_MV /** - * debug motion vectors - * - encoding: Set by user. - * - decoding: Set by user. + * @deprecated unused */ + attribute_deprecated int debug_mv; #define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames #define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames #define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames +#endif /** * custom intra quantization matrix diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index a570e25e0d..3abb691ac7 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -342,7 +342,11 @@ static int update_context_from_user(AVCodecContext *dst, AVCodecContext *src) dst->opaque = src->opaque; dst->debug = src->debug; +#if FF_API_DEBUG_MV +FF_DISABLE_DEPRECATION_WARNINGS dst->debug_mv = src->debug_mv; +FF_ENABLE_DEPRECATION_WARNINGS +#endif dst->slice_flags = src->slice_flags; dst->flags2 = src->flags2; diff --git a/libavcodec/version.h b/libavcodec/version.h index 9f80caa9e0..f3974c2cb3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 117 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 118 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -54,9 +54,6 @@ #ifndef FF_API_LOWRES #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_DEBUG_MV -#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_AVCTX_TIMEBASE #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #endif @@ -150,5 +147,8 @@ #ifndef FF_API_THREAD_SAFE_CALLBACKS #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #endif +#ifndef FF_API_DEBUG_MV +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60) +#endif #endif /* AVCODEC_VERSION_H */