From patchwork Mon Apr 19 14:09:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27089 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp661716iob; Mon, 19 Apr 2021 09:16:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDcOjXIMIBdeGhuq2WPPme92dEYjAsyAi9wnF7R+M6I9V13fuU5DENNAcojxw05GJBc51K X-Received: by 2002:a17:906:2dd9:: with SMTP id h25mr22461909eji.6.1618848995967; Mon, 19 Apr 2021 09:16:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618848995; cv=none; d=google.com; s=arc-20160816; b=swhi/EejDbkPVV1mhTU/NG3GULS4tg4YKzwm8fYR0+b2q7NE6V/PVKd6rg+1DXIb+M b4JTrlWhkEjoLFdaQXKkBB2QJl4TTr2MfJDdcssw4zO/9X8YkfpAJQPm6B8oOXuLebni 7BmuzRiMJqs7g0ZysP/kDlzW2I1W5VpIjaWIns7wcVkxaaOxfXK3VVybeQfAOiw5lyDj poOiDAlrbiOdsutWw7rhRBZnCXklsL2nuls/bQuVeqPOcE4HGKdlQFqQrkf/l3AySGka luZI3AbSwGZ8JjlfoB7dppca5ATc1K2r4hGY1Lc3QZvEtpylzffXcKqcV0hbPsuhY8cP lIzQ== 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=yxnPULovE/OTx69TqO0Dmy45KQzUEp6y35PqLVdecgE=; b=QcEHSrgpxu0VwWDyLiFuqcm2c05n/PVffkE2WietNygFnOa2hmsu3itUdDZUIsj4Qu 64FdyUWBrmV9Z7bcW7X3Z7lF/G/HbzKAYp6oS+tvuHg3RUqiaDrqMBkITrsZZzt5pqaA j9xtkeJMgJfn9NAyHGXwXH3XDmiVjCi1A8FFPdJNoU+z47jwi5p28xPPd8QTc+GyBiGf cTNISX3bW5iC79zJQwX/x2WUny+FpzfIu8MOpBrxQqWjAGHLH7Un/iqQ1/3/Wx6DO8fo D158RY7KNXears8S69ej6luFtqqTCStm+zuGYyLDKIgq2u9ICtGT6QZG5nyIVO4aXmL7 mPuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pKSg6C12; 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 y13si11332229edr.168.2021.04.19.09.16.35; Mon, 19 Apr 2021 09:16:35 -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=pKSg6C12; 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 6121068026B; Mon, 19 Apr 2021 19:16:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B7F568026B for ; Mon, 19 Apr 2021 19:16:25 +0300 (EEST) Received: by mail-vs1-f54.google.com with SMTP id t23so1522699vso.11 for ; Mon, 19 Apr 2021 09:16:25 -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=M39YEesVR8B6UqOxJGlwKciQ64jzpICsFlM3XnLhCrs=; b=pKSg6C12ihjeyAGyUl7DXCsuoHMlcX+CpkpRVSxFQRsmXCAT4Gjbl4HeXhHl8vikMK NfIp8J6rlyktzmN9uNVRvSw1VBOmT0ZNXPd+qqFrNN77vq1fjyRRkocKquLigCwNxK5t aLlmvPHFhnBWIu/0K4rlhiOXq3SI7pVzV0r+0QiOEBJ4O/acRnLsjZL0BOZ2lbbLQ7HA PdkGo309WD2pFV4OyY7nmo6IhmdVVCCTdXQSXcgu0s4i7eWxrDt1bxV8DIhfgKT+Ur53 rV1jKP/43/VKHsXBtqk9MgMIDs99KZX3rMaGAQw7kTsZ/z9fQDPj5Xe7b6CM9cf1yDqH CCkw== 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=M39YEesVR8B6UqOxJGlwKciQ64jzpICsFlM3XnLhCrs=; b=Sl2a1cefYpvWdYlu/YnSotUSlxQ7PcjllCFr7mYbyx4v6Ns5e1K/MVe8jsbryyifuf TtC6w87S3a1ouEt+yb0ZAq62dkcM6vpb6mfNoX7d3VBjIJj9ufxkUZnafpI7g9ev+nD6 KgAqVHuwGj43tozFnSBQkjuM3PMAg2nsqsTRfFMdtpPdoD2r81FlZ3AJo0Rg3A/sMXgb zBvjNvkUdyWF9cBLABAg/EUbJesbN6n/0vcy6ogsSINk4z7jQeTjwWdbvB8MGYqp0vFC fxlZjm4hCPT1eTtWFLFPsonTsurGEHH4SNYLbJo32Ai49yrb5f3FPQ++UlI2fEmxpYSI JQrA== X-Gm-Message-State: AOAM532QilbbX4a0CUgJ8BVdKjqKIOKBC/f43D9Rx9vCrj5ZKc5f6kJ8 kVpPZ4cjM1AbGrUTBtDItRK+QzGpDY8= X-Received: by 2002:a0c:f901:: with SMTP id v1mr21277023qvn.26.1618841484958; Mon, 19 Apr 2021 07:11:24 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:16 -0300 Message-Id: <20210419141024.8174-20-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 19/87] avcodec/mpegvideo_enc: Remove deprecated RTP-callback 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: 58hxWqnNlt7R From: Andreas Rheinhardt Deprecated in 462a54e2291e1fa18e1f1254d09739dfbb795617. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 14 -------------- libavcodec/mpegvideo_enc.c | 21 --------------------- libavcodec/version.h | 3 --- 3 files changed, 38 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 69f69a1aa4..064af12f31 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1387,20 +1387,6 @@ typedef struct AVCodecContext { */ int trellis; -#if FF_API_RTP_CALLBACK - /** - * @deprecated unused - */ - /* The RTP callback: This function is called */ - /* every time the encoder has a packet to send. */ - /* It depends on the encoder if the data starts */ - /* with a Start Code (it should). H.263 does. */ - /* mb_nb contains the number of macroblocks */ - /* encoded in the RTP payload. */ - attribute_deprecated - void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); -#endif - /** * pass1 encoding statistics output buffer * - encoding: Set by libavcodec. diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f0490a39cc..1613d06023 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2946,14 +2946,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } -#if FF_API_RTP_CALLBACK -FF_DISABLE_DEPRECATION_WARNINGS - if (s->avctx->rtp_callback){ - int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x; - s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif update_mb_info(s, 1); switch(s->codec_id){ @@ -3429,19 +3421,6 @@ FF_ENABLE_DEPRECATION_WARNINGS write_slice_end(s); -#if FF_API_RTP_CALLBACK -FF_DISABLE_DEPRECATION_WARNINGS - /* Send the last GOB if RTP */ - if (s->avctx->rtp_callback) { - int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x; - int pdif = put_bits_ptr(&s->pb) - s->ptr_lastgob; - /* Call the RTP callback to send the last GOB */ - emms_c(); - s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } diff --git a/libavcodec/version.h b/libavcodec/version.h index fbdc99abca..0e20d5c2e2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_RTP_CALLBACK -#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif