From patchwork Mon Dec 25 02:12:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 6951 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp5286635jad; Sun, 24 Dec 2017 18:19:16 -0800 (PST) X-Google-Smtp-Source: ACJfBos3IVM5AopNJov2CiT/QmIK6VabhahUwOyH8xMldNwxuCAqXvFE1PU5LtdltS5/XkV6RseZ X-Received: by 10.28.131.73 with SMTP id f70mr18814806wmd.137.1514168356670; Sun, 24 Dec 2017 18:19:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514168356; cv=none; d=google.com; s=arc-20160816; b=fkgZGMwYRx050HHg+hegodvxcceUWLsbo5oFuaMv13EC+plxo7hZXsbRo5rfJI2FhK 9v0XJTuM5SRIx87GcbCqJWvDBN36G658nScf+eCIphS+iV6ZaV2UmJzAp/y0534ewMsr bUtDWlif70Iph8hdvTUQuIEIJAeDHxck0OKyF2EEhCQZ49OCBPB+vrXgz5oa9YxbHbCD dYGh5jxawOhYBTFnc9bIsKgsIYNklLpBpl6qcpog6XrSg39G7h/n8j7Ekwc8DRCIHACx YI7WKk8cWw0KXsT/WUmpgHHFU6B68ZivWmDVaOO1Jq1xZ+CN9Xn5c6p256nmkkeUU69z YJUQ== 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:cc: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=5RlTE4uF8O3kzYNV4y6eozK565kDdXasSDcHF7Wqa4E=; b=DJXowABN5MOytvjTxqhkFTwMzFGrpivNsrLziIIw8qDu0qzqYjPEuUdNMM1fUYi3/0 V7QIiTFoRxR1e8DP7In28fl1GCc+nnbGS+3vtoMhJd1qr67WETj1yOJ2ty4N7x0owrfC a+iE1GyIvKO6U//xORQTxoprUeD5g0DTyHtaaHSvLAUoNI8kwQ41GeVgMTd6ufsjHhlV dP+YrWxNwx3JjGM2wHtAG/evwpmvC92ZHKtkE+2xM2VWp1khoMbdupMjyjcQlF47wtNH gTG85bazOBZKSXqjduAlXkLfZrl9+3Kvi29TotymNDgZB85kWYatVs28lXlOr8bgbKol Z95Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FYiKVlG6; 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 e67si9890161wmd.231.2017.12.24.18.19.15; Sun, 24 Dec 2017 18:19:16 -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=FYiKVlG6; 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 C81EF680635; Mon, 25 Dec 2017 04:19:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88C2568041B for ; Mon, 25 Dec 2017 04:19:00 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id o2so32274107wro.5 for ; Sun, 24 Dec 2017 18:19:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=T8SOQnnyZmOpMJZPQUOWhaHQ88hRE/P0XS9K8GeMe6M=; b=FYiKVlG63jOFe7vA0JWpFQspGI6lxIKliEj18Mw+EJcOdYEowMCo4jPfGLeMz6KqpG GAgNxWUoSed0XnwEXg8QxsMb2kBhyFnOesCRWSKX5XOwhKiSvoMSLeC74+RKCQBjYxR8 6BOw2DHzeYzhLXSJZtCSpligPIVhi/tzuCdR9+HMNni7jT2heKQ6J+5c9n7Y0wIKdRvq fsEqKMT5W/qSoETw1buEQpQCUFwo6jSYdNOAM+mx4jwhMgX0X1Z4+z+4918YM9/Nsyx2 B0pPnianBtfGB1OJCMKBD4hJYRg+tVRAWgVG4y3tsqqK7yX4yrT0rr/EvnQTP3zRBT1s V11g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=T8SOQnnyZmOpMJZPQUOWhaHQ88hRE/P0XS9K8GeMe6M=; b=khz4S1zLXavjgTgmX3UHpH4F/3eY2rgSuZxc2NLaXJw+4TjjiVQhXH4+aY0G19K37O /1DXlP2hm36pc9YN9kSCnR+S4gDFKNCYcUZ7T0CZoEyEdkoKgixq5YUk7jpSGmpp9eOr vSP4SWvjBTbkRo224vJauf3ZuZopIsOx9aJHaiNqxlDWzG0yxrRnGdVZqpYXKjEoTQPZ Zh5xTvEMKUcqj0Wn79LQjW3jGh9ofnPjZ4C2AnSEhb84x/wifhZOUMnO8E33dXOfn1H4 FXB7dm44DJMFilihnZ1Yj8FkOOvN+ZE4Jt21kLQZeaQ3DcZkXD6IkU16jLtdreo/4k/U qKAw== X-Gm-Message-State: AKGB3mKFtOL5mmx1Fc+7/ROXeJ6TjHnIOPecA3T5+GdgpEwelb9qt/s6 VlkHLAqMOpqiC1wy+wqQwt0yZjAV X-Received: by 10.223.142.40 with SMTP id n37mr20927740wrb.255.1514167961710; Sun, 24 Dec 2017 18:12:41 -0800 (PST) Received: from skyhide.pars.ee ([2a00:23c4:7c83:f700:c41e:81a6:2466:d2d6]) by smtp.gmail.com with ESMTPSA id i65sm53682472wme.20.2017.12.24.18.12.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Dec 2017 18:12:40 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 02:12:38 +0000 Message-Id: <20171225021238.1318-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.1.620.gb9897f4670 Subject: [FFmpeg-devel] [PATCH] lavr: deprecate the entire library 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Rostislav Pehlivanov --- doc/APIchanges | 5 +++++ libavresample/avresample.h | 30 +++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index df79758e86..96fad416d5 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,11 @@ libavutil: 2017-10-21 API changes, most recent first: +2017-xx-xx - xxxxxxx - lavr 4.0.0 - avresample.h + Deprecate the entire library. It was unmaintained and redundant + as libswresample did everything it did better, faster, with more + control and with a better, slightly higher level API. + 2017-12-xx - xxxxxxx - lavu 56.7.100 - cpu.h AVX-512 flags added. diff --git a/libavresample/avresample.h b/libavresample/avresample.h index 193443e2a6..57889c572c 100644 --- a/libavresample/avresample.h +++ b/libavresample/avresample.h @@ -103,10 +103,10 @@ #define AVRESAMPLE_MAX_CHANNELS 32 -typedef struct AVAudioResampleContext AVAudioResampleContext; +typedef attribute_deprecated struct AVAudioResampleContext AVAudioResampleContext; /** Mixing Coefficient Types */ -enum AVMixCoeffType { +enum attribute_deprecated AVMixCoeffType { AV_MIX_COEFF_TYPE_Q8, /** 16-bit 8.8 fixed-point */ AV_MIX_COEFF_TYPE_Q15, /** 32-bit 17.15 fixed-point */ AV_MIX_COEFF_TYPE_FLT, /** floating-point */ @@ -114,13 +114,13 @@ enum AVMixCoeffType { }; /** Resampling Filter Types */ -enum AVResampleFilterType { +enum attribute_deprecated AVResampleFilterType { AV_RESAMPLE_FILTER_TYPE_CUBIC, /**< Cubic */ AV_RESAMPLE_FILTER_TYPE_BLACKMAN_NUTTALL, /**< Blackman Nuttall Windowed Sinc */ AV_RESAMPLE_FILTER_TYPE_KAISER, /**< Kaiser Windowed Sinc */ }; -enum AVResampleDitherMethod { +enum attribute_deprecated AVResampleDitherMethod { AV_RESAMPLE_DITHER_NONE, /**< Do not use dithering */ AV_RESAMPLE_DITHER_RECTANGULAR, /**< Rectangular Dither */ AV_RESAMPLE_DITHER_TRIANGULAR, /**< Triangular Dither*/ @@ -132,17 +132,20 @@ enum AVResampleDitherMethod { /** * Return the LIBAVRESAMPLE_VERSION_INT constant. */ +attribute_deprecated unsigned avresample_version(void); /** * Return the libavresample build-time configuration. * @return configure string */ +attribute_deprecated const char *avresample_configuration(void); /** * Return the libavresample license. */ +attribute_deprecated const char *avresample_license(void); /** @@ -155,6 +158,7 @@ const char *avresample_license(void); * * @return AVClass for AVAudioResampleContext */ +attribute_deprecated const AVClass *avresample_get_class(void); /** @@ -162,6 +166,7 @@ const AVClass *avresample_get_class(void); * * @return allocated audio resample context, or NULL on failure */ +attribute_deprecated AVAudioResampleContext *avresample_alloc_context(void); /** @@ -178,6 +183,7 @@ AVAudioResampleContext *avresample_alloc_context(void); * @param avr audio resample context * @return 0 on success, negative AVERROR code on failure */ +attribute_deprecated int avresample_open(AVAudioResampleContext *avr); /** @@ -186,6 +192,7 @@ int avresample_open(AVAudioResampleContext *avr); * @param avr AVAudioResampleContext to check * @return 1 if avr is open, 0 if avr is closed. */ +attribute_deprecated int avresample_is_open(AVAudioResampleContext *avr); /** @@ -201,6 +208,7 @@ int avresample_is_open(AVAudioResampleContext *avr); * * @param avr audio resample context */ +attribute_deprecated void avresample_close(AVAudioResampleContext *avr); /** @@ -210,6 +218,7 @@ void avresample_close(AVAudioResampleContext *avr); * * @param avr audio resample context */ +attribute_deprecated void avresample_free(AVAudioResampleContext **avr); /** @@ -234,6 +243,7 @@ void avresample_free(AVAudioResampleContext **avr); * @param matrix_encoding matrixed stereo downmix mode (e.g. dplii) * @return 0 on success, negative AVERROR code on failure */ +attribute_deprecated int avresample_build_matrix(uint64_t in_layout, uint64_t out_layout, double center_mix_level, double surround_mix_level, double lfe_mix_level, int normalize, double *matrix, @@ -251,6 +261,7 @@ int avresample_build_matrix(uint64_t in_layout, uint64_t out_layout, * @param stride distance between adjacent input channels in the matrix array * @return 0 on success, negative AVERROR code on failure */ +attribute_deprecated int avresample_get_matrix(AVAudioResampleContext *avr, double *matrix, int stride); @@ -272,6 +283,7 @@ int avresample_get_matrix(AVAudioResampleContext *avr, double *matrix, * @param stride distance between adjacent input channels in the matrix array * @return 0 on success, negative AVERROR code on failure */ +attribute_deprecated int avresample_set_matrix(AVAudioResampleContext *avr, const double *matrix, int stride); @@ -302,6 +314,7 @@ int avresample_set_matrix(AVAudioResampleContext *avr, const double *matrix, * @param channel_map customized input channel mapping * @return 0 on success, negative AVERROR code on failure */ +attribute_deprecated int avresample_set_channel_mapping(AVAudioResampleContext *avr, const int *channel_map); @@ -318,6 +331,7 @@ int avresample_set_channel_mapping(AVAudioResampleContext *avr, * @param compensation_distance compensation distance, in samples * @return 0 on success, negative AVERROR code on failure */ +attribute_deprecated int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta, int compensation_distance); @@ -331,7 +345,7 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta, * @return number of samples or AVERROR(EINVAL) if the value * would exceed INT_MAX */ - +attribute_deprecated int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples); /** @@ -376,6 +390,7 @@ int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples); * not including converted samples added to the internal * output FIFO */ +attribute_deprecated int avresample_convert(AVAudioResampleContext *avr, uint8_t **output, int out_plane_size, int out_samples, uint8_t * const *input, int in_plane_size, @@ -394,6 +409,7 @@ int avresample_convert(AVAudioResampleContext *avr, uint8_t **output, * @param avr audio resample context * @return number of samples currently in the resampling delay buffer */ +attribute_deprecated int avresample_get_delay(AVAudioResampleContext *avr); /** @@ -411,6 +427,7 @@ int avresample_get_delay(AVAudioResampleContext *avr); * @param avr audio resample context * @return number of samples available for reading */ +attribute_deprecated int avresample_available(AVAudioResampleContext *avr); /** @@ -430,6 +447,7 @@ int avresample_available(AVAudioResampleContext *avr); * @param nb_samples number of samples to read from the FIFO * @return the number of samples written to output */ +attribute_deprecated int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_samples); /** @@ -476,6 +494,7 @@ int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_sample * @return 0 on success, AVERROR on failure or nonmatching * configuration. */ +attribute_deprecated int avresample_convert_frame(AVAudioResampleContext *avr, AVFrame *output, AVFrame *input); @@ -494,6 +513,7 @@ int avresample_convert_frame(AVAudioResampleContext *avr, * @param in input AVFrame * @return 0 on success, AVERROR on failure. */ +attribute_deprecated int avresample_config(AVAudioResampleContext *avr, AVFrame *out, AVFrame *in); /**