From patchwork Mon Oct 18 12:47:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 31143 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3262303ioa; Mon, 18 Oct 2021 05:48:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybOUyPR848Qt61MXwg248eiO9L8p5CR1nTuH5GZQya8A7hbCRPm6WO0tRZ/HrAuWPMK1Ne X-Received: by 2002:a50:e141:: with SMTP id i1mr45236390edl.157.1634561280231; Mon, 18 Oct 2021 05:48:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634561280; cv=none; d=google.com; s=arc-20160816; b=zgSmNxBPmdYj4ETKNrEOiK2JOITSgkExu85ohClOOb7wqXutyscrOLSQN1aXYJ4rKG ru98hA9/xwVQA/h9vc+4JWke5qvI9UzUfKA8250Uf1Wp6X0dPy7Tl9thQboXZOQ3kWRf uXCk4N3Kbbf0eVPLv7wKnz2L9ncErvOsqMFSjcJB6b+jyXCsTmSGcpKxCNVfpv6G/qAw Cwu1xh7Wuyy3mWz3gYFsWZTXBi/OMomT2l0b7vRul6zOGg4/smU9NAbnQC2qft8bhMf9 kVVK1jnDzFDEPjkvroqyGunf0qD37Q0OekyOa0rSK8Nj61pFFZKwfp7X03n9JriyKUwz RM/g== 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=EVJqkj9KOlgNObXTfPI/VtkAw3VoVTp8otIzJUjbAqk=; b=FS0plp0XvzuPdWqbyj0wkxn6970lcsdPtOlEJZ48kX6N99aq3p/N5XTe5JslLJyOtU aA7nSfvBY2BqGM/7RSFQCNgQ6pqJBTqBaqLaNiyEXYXypnuBhpxxB9rDkTef/92v+iHJ VtoX7jzXX57aLXQuo81RzK3X4HsV1Kt8UoRe4Mp22ExQ0JZgQ/J8hC1TjlAWj+81Jug4 zYn153SRwKhNK5QY4ALrmLrHPQXw+sh//AEDTOlS3uVGZc/gMD7WT1aKNhyzwTNIYaOy eqocqiGv4Wfx0aY6a9JdrLLvmO5Y7+zxCOAZndBnxmDC4D5RQj9Vx5XuO/EAyn4lekG4 euYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=caGmTBrq; 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 gz15si24407991ejc.443.2021.10.18.05.47.59; Mon, 18 Oct 2021 05:48:00 -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=20210112 header.b=caGmTBrq; 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 055E968A633; Mon, 18 Oct 2021 15:47:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA30168A6B0 for ; Mon, 18 Oct 2021 15:47:31 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id i24so66250064lfj.13 for ; Mon, 18 Oct 2021 05:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YgpPHLM9gTKGT3kvBZqj0m3DbTFwA7GHLtERz8yiMMA=; b=caGmTBrqifKYroSxk3cleKefyTrkMh5Lj+wu8M8mGitfLJwYJgRafCbX+AJFUFsUba C2jz9AgurZSHTid49OQdqo55TjnmVNM7mg6auxAImgVVtn+FtdCfQEs/KoeqY37XFAQ8 YxFlkvqlOv06iJyNlWtPkTqT9EgNHd1QzawRbhKJwjz4EuyW8+IjWRohFvV6N2JJdQb9 CdgE3z0xkxi8c9gN9h4wyrAgTw4TA8wNwZZGS9EpVYL4VjRf4i0BjIEFDUsl8Tz8vSQ8 0BOsXoGRD64Swo0vCE8eGdW5FsElc8HamDRTI1HqRrmdnMrP/fAUYQSz41rW7E779eKG 5Y6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YgpPHLM9gTKGT3kvBZqj0m3DbTFwA7GHLtERz8yiMMA=; b=jBB+bso78hZwijcznnXqFsGvKgJyHGvRapBj9zaXuG0tAOGpf3QC49z6LK0mEFgzYn RnNpkTQ0I8hIBjYiCmo0Yya22Tdmb0iSgYRj9Of8MLsckSa3ikLlo54FMKGHn9nHqPeY WfBijws9MrZdB+Uneqn7o7oYIZ1DjR7PYcQUW0JaRdyTVmfhBfAbBxOJLNZYi8nqOznX aLgJiTUERh4xlfIj2FTiyBasGySuHAxtkOkZxOBhXY8T9VoHS5T0N9QwBWsoIpFTfTAN r2+7ISush7VVv8Gi+1rG2H0PS/Cm9RcP26vi5x16a36EVNrfUHFue9b5DTrgkDDpqsjt e/rg== X-Gm-Message-State: AOAM530W+uc46d3k8cgx90D4gzL51UDnCXNny+6Pp+LQ+7dne6KagIDx PT4Tz4vf1Z28yOVab5huL0dk3XZVc8cYDXP3 X-Received: by 2002:a05:6512:2025:: with SMTP id s5mr27765798lfs.30.1634561250688; Mon, 18 Oct 2021 05:47:30 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id m16sm1392779lfl.212.2021.10.18.05.47.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 05:47:30 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Oct 2021 15:47:22 +0300 Message-Id: <20211018124723.11497-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211018124723.11497-1-jeebjp@gmail.com> References: <20211018124723.11497-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] avformat/avio{, buf}: deprecate AVIOContext::written 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: NtQNyL0uKbva Originally added as a private entry in commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, but its grouping with the comment noting its private state was missed during merging of the field from Libav (most likely due to an already existing field in between). --- doc/APIchanges | 6 ++++++ libavformat/avio.h | 6 ++++++ libavformat/aviobuf.c | 9 +++++++++ libavformat/version.h | 5 ++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 7b267a79ac..4731e14cb1 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,12 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-10-13 - xxxxxxxxxx - lavf 59.7.100 - avio.h + Deprecate AVIOContext.written. Originally added as a private entry in + commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, its grouping with + the comment noting its private state was missed during merging of the field + from Libav (most likely due to an already existing field in between). + 2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h Add AV_PIX_FMT_X2BGR10. diff --git a/libavformat/avio.h b/libavformat/avio.h index a7b56ab667..5e60c2e35c 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -290,7 +290,13 @@ typedef struct AVIOContext { */ int ignore_boundary_point; +#if FF_API_AVIOCONTEXT_WRITTEN + /** + * @deprecated field utilized privately by libavformat. + */ + attribute_deprecated int64_t written; +#endif /** * Maximum reached position before a backward seek in the write buffer, diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index b18a56ef19..f21f1c89df 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -22,6 +22,7 @@ #include "libavutil/bprint.h" #include "libavutil/crc.h" #include "libavutil/dict.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" @@ -124,7 +125,11 @@ void ffio_init_context(FFIOContext *ctx, ctx->current_type = AVIO_DATA_MARKER_UNKNOWN; ctx->last_time = AV_NOPTS_VALUE; ctx->short_seek_get = NULL; +#if FF_API_AVIOCONTEXT_WRITTEN +FF_DISABLE_DEPRECATION_WARNINGS s->written = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } AVIOContext *avio_alloc_context( @@ -166,7 +171,11 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len) } else { if (s->pos + len > ctx->written_output_size) { ctx->written_output_size = s->pos + len; +#if FF_API_AVIOCONTEXT_WRITTEN +FF_DISABLE_DEPRECATION_WARNINGS s->written = ctx->written_output_size; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } } } diff --git a/libavformat/version.h b/libavformat/version.h index d5dd22059b..de780124c7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 6 +#define LIBAVFORMAT_VERSION_MINOR 7 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -61,6 +61,9 @@ #ifndef FF_API_COMPUTE_PKT_FIELDS2 #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) #endif +#ifndef FF_API_AVIOCONTEXT_WRITTEN +#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) +#endif #ifndef FF_API_R_FRAME_RATE