From patchwork Mon Apr 19 14:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp580567iob; Mon, 19 Apr 2021 07:40:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOsY68mdnvA4Zck/4rs7U5TYl2IJIrBcOVRPzRn4Omz2N2G2Mgz9b2lEfdlIboREmpgfN8 X-Received: by 2002:aa7:d15a:: with SMTP id r26mr3458586edo.283.1618843255720; Mon, 19 Apr 2021 07:40:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618843255; cv=none; d=google.com; s=arc-20160816; b=ZdHDlylI+EzPKtvocKzz7shHzmmXRLDUaNXVBDUEi1vYjSnwHNLgifJmD6ig9dqmAe tZfGYD74uJgemvkNgpMkII3QioiPhR+4R0hpmJXNrdGeWxWbfVZ8bl8aq6j7Ff1RpLUI t0rts4VQWBIVJu07wewBDI16XSRev5YIVk95IppZ7a+LwiNf8jB6GR1+g4ql7ok+WAZd UXBVRP/hLyTSopbu+TbQlAnh/HVjtJfEwEsjeZjaJ9OT/YwROKDbcdjdCGyygyIupTKH 7DjcePbeotFxxij72SlbFHhMR4EjhV6WhffO/b0/2GsV+xSq9/1luvi29vh2L1Jd3kFz 5CSw== 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=2eLHPM9Urzu8/V6RFxdq6GDGai2CoE2ayUxIt4o947I=; b=CyPJlqdOgHK4dcp8hF2vJvWit3WZr6Dr3z9gfF1XSI0oy6w3Je/WuCapSJY7JbLgq1 wjXOFVxFGKGqz06RUr8gyNj0CL/qFZa0fVlFd8oYE/stwhxQukIiAoiHkXRtAFdEHSkf 9YiWK3hSBY05si24PSzeoM5QKM3oHJCStHbl3fG2+0l/kpJBROvczU7bCRmL9+Sfu9z4 Pyqaok0ajMMhwc2W4TtJjbhHna1QYnqNXL6+Z3cUIrtnc0jW0CUjjTBGyh3v9zzAP5Nt FnQbhXmvsNTuoqtfN/Q1xe2b/tmXoug4f1i4+sNgT/8NxTU/84uWnirKWuENy58dPZIE p4Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B5BkYp7v; 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 kq9si12311614ejb.12.2021.04.19.07.40.55; Mon, 19 Apr 2021 07:40:55 -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=B5BkYp7v; 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 6719368A48A; Mon, 19 Apr 2021 17:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0CB568004F for ; Mon, 19 Apr 2021 17:40:46 +0300 (EEST) Received: by mail-qt1-f174.google.com with SMTP id h7so26229534qtx.3 for ; Mon, 19 Apr 2021 07:40:46 -0700 (PDT) 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=JmoKnBP5VBa++NmsVmDs99lWoD0druf0LW2W4p7Uj3I=; b=B5BkYp7vabwyIz7exhqMg0l94SrayVqeX8R57XzduLvyBACRS+7oro0B1KWHwIK9bj h/xpKQFXkmjaKxBp0OiLxDgArpA8eD/c9nZ0pSkVXx3sBJ48AasMRmeydzlCro0he533 Rp4xvJhqspK11RCpd87i9LOlS/ldoYdwgdGJIoL89hzR/nIQYZQw9jYiTWag7+H9tgCU uGcSGHTVMe41HxUbOWbCpL/fMiIq2ZS49V4BdULkiAOnKaFfUdNKpiTM3E/ikw2kfS0j JOn3Ai/zgnmlHhE/CHnDVPi5DKHtzahY1/RYU5cqn55oEfKBMUPjrswgtcQu/zbV22W7 /aEQ== 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=JmoKnBP5VBa++NmsVmDs99lWoD0druf0LW2W4p7Uj3I=; b=rkJ1aPfUmzZCKNRzR0ziG84YBq2cMSyT3epZ74TV+Zd0Dnw1/pzCQGXHESHG0M3ema eLLXu54bj10VN+OmB3gCj2+MkKcNx2qSA1lnkXShAPVmiqa8Z0o8kR/306RjsPFYhVKU ou6eRZ3Auf/7Oc3mqPk1RgPzGo7ZGt5NGBl7iXeM9ckWaUdvHOI61mC7bFmFTQQD6oaO CLZURZR00a6bvMpbZdtVnPx0Yc9TjLLKhJLZiXTwOfDMRg4bPkQ7dhCUBWCvlZ0S38cR BbzH33CowXnTXvoI1Aj0sRUzJtRvA8/lBmWr8pgGLHW2sY52yvZtCu8z3g1gp7pLDM0W sKMg== X-Gm-Message-State: AOAM533Ay5YByDRlE+DPnYQsRit4mEnjLTtrmdqT/Kcuz8rsRPahFCLN Rkeu0VcXqZP5ABHqfkw7zY2lMZ9IRi4= X-Received: by 2002:ac8:7b32:: with SMTP id l18mr7538704qtu.210.1618841468714; Mon, 19 Apr 2021 07:11:08 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:02 -0300 Message-Id: <20210419141024.8174-6-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/87] avcodec, avformat: Remove AVPacket.convergence_duration 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: UmnJ0AFHvW9u From: Andreas Rheinhardt Deprecated in 948f3c19a8bd069768ca411212aaf8c1ed96b10d. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 8 -------- libavcodec/avpacket.c | 16 ---------------- libavcodec/packet.h | 10 ---------- libavcodec/parser.c | 5 ----- libavcodec/version.h | 3 --- libavformat/matroskadec.c | 8 -------- libavformat/matroskaenc.c | 8 -------- libavformat/srtenc.c | 7 ------- libavformat/utils.c | 6 ------ 9 files changed, 71 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b46b858416..81a18e2cde 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3386,14 +3386,6 @@ typedef struct AVCodecParserContext { */ int key_frame; -#if FF_API_CONVERGENCE_DURATION - /** - * @deprecated unused - */ - attribute_deprecated - int64_t convergence_duration; -#endif - // Timestamp generation support: /** * Synchronization point for start of timestamp generation. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index b5bac5c5f2..b726a8db0e 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -39,11 +39,6 @@ void av_init_packet(AVPacket *pkt) pkt->dts = AV_NOPTS_VALUE; pkt->pos = -1; pkt->duration = 0; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - pkt->convergence_duration = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags = 0; pkt->stream_index = 0; pkt->buf = NULL; @@ -605,11 +600,6 @@ int av_packet_copy_props(AVPacket *dst, const AVPacket *src) dst->dts = src->dts; dst->pos = src->pos; dst->duration = src->duration; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - dst->convergence_duration = src->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->flags = src->flags; dst->stream_index = src->stream_index; @@ -742,12 +732,6 @@ void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb) pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb); if (pkt->duration > 0) pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb); -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (pkt->convergence_duration > 0) - pkt->convergence_duration = av_rescale_q(pkt->convergence_duration, src_tb, dst_tb); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } int avpriv_packet_list_put(PacketList **packet_buffer, diff --git a/libavcodec/packet.h b/libavcodec/packet.h index ca18ae631f..47e9b8999b 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -387,16 +387,6 @@ typedef struct AVPacket { int64_t duration; int64_t pos; ///< byte position in stream, -1 if unknown - -#if FF_API_CONVERGENCE_DURATION - /** - * @deprecated Same as the duration field, but as int64_t. This was required - * for Matroska subtitles, whose duration values could overflow when the - * duration field was still an int. - */ - attribute_deprecated - int64_t convergence_duration; -#endif } AVPacket; #if FF_API_INIT_PACKET diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 11c41d6a0a..08b9945a57 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -67,11 +67,6 @@ found: goto err_out; } s->key_frame = -1; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - s->convergence_duration = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->dts_sync_point = INT_MIN; s->dts_ref_dts_delta = INT_MIN; s->pts_dts_delta = INT_MIN; diff --git a/libavcodec/version.h b/libavcodec/version.h index 9b017d1980..b2882361bc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -57,9 +57,6 @@ #ifndef FF_API_VDPAU_PROFILE #define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CONVERGENCE_DURATION -#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e8c76f9cfb..116e331215 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3572,14 +3572,6 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, pkt->pos = pos; pkt->duration = lace_duration; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (st->codecpar->codec_id == AV_CODEC_ID_SUBRIP) { - pkt->convergence_duration = lace_duration; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - res = avpriv_packet_list_put(&matroska->queue, &matroska->queue_end, pkt, NULL, 0); if (res < 0) { av_packet_unref(pkt); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 0141fb0b8d..b36e86ecb1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2372,14 +2372,6 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt) mkv_blockgroup_size(pkt->size, track->track_num_size)); -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - /* For backward compatibility, prefer convergence_duration. */ - if (pkt->convergence_duration > 0) { - duration = pkt->convergence_duration; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* All subtitle blocks are considered to be keyframes. */ mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 1); put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c index 484dd4d230..9bb0ff94c1 100644 --- a/libavformat/srtenc.c +++ b/libavformat/srtenc.c @@ -73,13 +73,6 @@ static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt) y2 = AV_RL32(p + 12); } -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (d <= 0) - /* For backward compatibility, fallback to convergence_duration. */ - d = pkt->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s == AV_NOPTS_VALUE || d < 0) { av_log(avf, AV_LOG_WARNING, "Insufficient timestamps in event number %d.\n", srt->index); diff --git a/libavformat/utils.c b/libavformat/utils.c index 02768aca1f..322ccd3af2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1439,12 +1439,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, /* update flags */ if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || ff_is_intra_only(st->codecpar->codec_id)) pkt->flags |= AV_PKT_FLAG_KEY; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (pc) - pkt->convergence_duration = pc->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } /**