From patchwork Sat Sep 7 03:31:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 14965 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 445F444A340 for ; Sat, 7 Sep 2019 06:37:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08E15687F4B; Sat, 7 Sep 2019 06:37:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF85A687F4B for ; Sat, 7 Sep 2019 06:37:45 +0300 (EEST) Received: by mail-io1-f42.google.com with SMTP id b136so17438770iof.3 for ; Fri, 06 Sep 2019 20:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=QsI3z+RewkZDf4hCGQnBQm4Li9BGpNOX6qRefcY8zcA=; b=pokBwAUDnAzMorMV1e5Qek0S3YzwIoeemoHS9lphH50GhHB/SP0UHHg/CUYTa6pusT JK8Ivo2svWNTQJNFr90LlAGWQ96VVJDRYHrxNH/8aibJHfHmEogp6CR4c1KGwZOTdjVO Z8xB1sZbtt+1FgG79PkF1o+xYuA5JnNWLREH2JHaHakUz4BpFXuZYJTNinPjJ030fIpj G7eL1nIAy3kKOWCBjRQa4Pmn2/nmDh1iJqesQpnmxwTxLZxBZBTOFxz722pmgdn0qHmd k7gWoljmfUowJ7ZFnK/oty4yHKobWJVW2icf5EtmJ8NpURlBAyqA3Si3RL7DXLEvrqO6 dXxA== 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:mime-version :content-transfer-encoding; bh=QsI3z+RewkZDf4hCGQnBQm4Li9BGpNOX6qRefcY8zcA=; b=R5DUVFtrEGSYv9BiLee+2degHsRgOanDYZiG2ecUmswacv+O1GKQQM9EkWQWTS4rkL JNecanBZP0SaUlcBDZqLYpBdOf1u9I8GAF9a4c9g5QQI76ohw5vgjV/jDh7bd1YlykRH Z7/ZV5YUXedhEndpkMoPPmx0S/amJA/UHcWbpK5yMx3Mygny8U811q53udNHYIzQfsWC YfCpvuuvddJwENB0OmY7oEWxqXd7P6Jj7vOVaaihmlHRmomg39qfvk7d0lVoB22DfJqk 8MEm3k1qRwAEreDV8H8aMWF3PBUbX4iFQoSi6COKJdAWiDvUj/yGHjDLYTd2CbicTMYG YpTw== X-Gm-Message-State: APjAAAVNz2cfn8ozmUn2kCkq/K6Hi5eXsWjRVTEIaQK5/QoJ0afHhIjl OYz6lhMcMZ+MJaecUkanVYHAxM6KI8I= X-Google-Smtp-Source: APXvYqyjjCpmTNi/IATi5+LJ1yRLpQHjmymEfA9bPUQuv+WwtR2svpm1nu0TuXMNrcKI4HTsNZia4Q== X-Received: by 2002:a5d:938a:: with SMTP id c10mr2326331iol.131.1567827070932; Fri, 06 Sep 2019 20:31:10 -0700 (PDT) Received: from MacBook-Pro.localdomain ([24.14.135.13]) by smtp.gmail.com with ESMTPSA id s8sm5586780ioe.0.2019.09.06.20.31.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Sep 2019 20:31:10 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Sep 2019 22:31:06 -0500 Message-Id: <20190907033106.35816-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/videotoolboxdec: fix crop handling when multithreaded 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was partially fixed by 233cd89, but it made changes to AVFrame fields from within end_frame, which doesn't work consistently when multithreading is enabled. This is what the post_process function is for. --- libavcodec/videotoolbox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index c718e82cc5..7948d21bcc 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -91,6 +91,11 @@ static int videotoolbox_postproc_frame(void *avctx, AVFrame *frame) return AVERROR_EXTERNAL; } + frame->crop_right = 0; + frame->crop_left = 0; + frame->crop_top = 0; + frame->crop_bottom = 0; + frame->data[3] = (uint8_t*)ref->pixbuf; if (ref->hw_frames_ctx) { @@ -898,11 +903,6 @@ static int videotoolbox_common_end_frame(AVCodecContext *avctx, AVFrame *frame) AVVideotoolboxContext *videotoolbox = videotoolbox_get_context(avctx); VTContext *vtctx = avctx->internal->hwaccel_priv_data; - frame->crop_right = 0; - frame->crop_left = 0; - frame->crop_top = 0; - frame->crop_bottom = 0; - if (vtctx->reconfig_needed == true) { vtctx->reconfig_needed = false; av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox decoder needs reconfig, restarting..\n");