From patchwork Fri Dec 25 15:47:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24655 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 56454449BE4 for ; Fri, 25 Dec 2020 18:54:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2584268AE81; Fri, 25 Dec 2020 18:54:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 352AA68ADB0 for ; Fri, 25 Dec 2020 18:54:18 +0200 (EET) Received: by mail-lf1-f45.google.com with SMTP id y19so10725873lfa.13 for ; Fri, 25 Dec 2020 08:54:18 -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:reply-to:mime-version :content-transfer-encoding; bh=nqua6AO8dTo5ND9go4tmZaZV046SAobbUKUstSIhIxo=; b=PPFU02MbOzrH6WD03LgAZfyb0I28HAi7XF1iW6Bdk5DxFZDkxNDlrApWZvCy2YxqhY sdpMoz6r1kFsDctWuttUmEYtT6IYGZWHtBa906H/vcZi9OFZdggYz0rYPi0DVPK3btxE En8gjPcLS5tDLjxowzdBpJuEM5Yltn8kJS0OZf+/IoZPjdzRZu1CWbkVlYlpr16QqNIc GnKBNqIDh4pP9u7/+zYEg+02KHUD4t/2lNlcx4SCfR/mHxaBBIjTZb/HustV0t1gV6Ro GrlLSz/i58/9QZqX8F+TsRqqhTtKxPgLd8Kso257/+rZZIwEnU0RsLkv1QC8c8XgDXvB ZO9g== 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:reply-to :mime-version:content-transfer-encoding; bh=nqua6AO8dTo5ND9go4tmZaZV046SAobbUKUstSIhIxo=; b=jMXd17rYTI/QIvdqCs2biSK2H9EcKhpSKBLJ0NMtLCwn/BabVeMetXz6jZ1hM4uX3x dswJ1RPwmY4KBkct6acrVk84yJy8S8bM0fZeIgHJXzbqz5K1y5M1Lx61wRnjJ+RIuuSt PpYneGYUfIOI49Kz7bCC2E7sxU1Byzl0tUUBmuawVzZ9Boy9lqiVYdrK617Ty7gBYaMO rgPa/+N8xPaaERXGI+PgWLfqiV569AAC6KutHRecXWMRuahFfYekZWM560jZbJ220jC7 lkzeVtJKbuA5ZN1gdBAO8INUKG5FHA+EVLVJyP+9Mj5GkaXO+MX6Yfzgs3pXzJaf68Dn QLZQ== X-Gm-Message-State: AOAM530s8GF4q2uUre5XYj1Fj4c8qMwRhBV7Xefq5RN97jj4sA12JIdg 81AqKeEF7Lovybo7vYzN+/xb39o5VLY= X-Google-Smtp-Source: ABdhPJwz0kKbCOTaxFUXwL/4BbFtDJYQrDQwXROgIJRJEwGga2IVGa14uuzJqxH+mVkJomxK4R3e1Q== X-Received: by 2002:a17:906:378f:: with SMTP id n15mr31413146ejc.263.1608911252598; Fri, 25 Dec 2020 07:47:32 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id ho12sm13733010ejc.45.2020.12.25.07.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Dec 2020 07:47:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Dec 2020 16:47:18 +0100 Message-Id: <20201225154724.287465-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/mpeg12dec: Remove update_thread_context 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" No decoder here supports frame threading. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6d0e9fc7ed..66556c7a82 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1074,33 +1074,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) return 0; } -#if HAVE_THREADS -static int mpeg_decode_update_thread_context(AVCodecContext *avctx, - const AVCodecContext *avctx_from) -{ - Mpeg1Context *ctx = avctx->priv_data, *ctx_from = avctx_from->priv_data; - MpegEncContext *s = &ctx->mpeg_enc_ctx, *s1 = &ctx_from->mpeg_enc_ctx; - int err; - - if (avctx == avctx_from || - !ctx_from->mpeg_enc_ctx_allocated || - !s1->context_initialized) - return 0; - - err = ff_mpeg_update_thread_context(avctx, avctx_from); - if (err) - return err; - - if (!ctx->mpeg_enc_ctx_allocated) - memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); - - if (!(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)) - s->picture_number++; - - return 0; -} -#endif - static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, const uint8_t *new_perm) { @@ -2902,7 +2875,6 @@ AVCodec ff_mpeg1video_decoder = { .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP, .flush = flush, .max_lowres = 3, - .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context), .hw_configs = (const AVCodecHWConfigInternal*[]) { #if CONFIG_MPEG1_NVDEC_HWACCEL HWACCEL_NVDEC(mpeg1),