From patchwork Mon Mar 8 14:00:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26255 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 A27084485B8 for ; Mon, 8 Mar 2021 16:01:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73DEF680972; Mon, 8 Mar 2021 16:01:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6979680867 for ; Mon, 8 Mar 2021 16:01:29 +0200 (EET) Received: by mail-qt1-f176.google.com with SMTP id w60so2616560qte.0 for ; Mon, 08 Mar 2021 06:01:29 -0800 (PST) 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=put97/wb1qdT4aCnbNxDC8Q8ewMnjFCWTT0woV4G33Q=; b=BdUrAwd4MPhyTOkKdYUnNPz2G1LdGgbE3xkQPddufk2ZfsPEN96fOMX6emitKLJCzV bSi0kHpvmB6PSyji9hL50ILAwibprhH+HFpDqgVSom5HVXKRWYJLWfuIBUytwcOsrsdN VbHc/ZPbAgJ+iydFrK5BdumhqTD462kNhJI+m2wgxwWCGbjfs3BDzLAr/3g4D2v+JnZ7 AHS5mKxCME//qsdJxb0IRFvSR6T1A0qv30n64WBrY4Fmk/rtSBZTu3wwdC59UOQcuIiF sgkgt4C/Qim6+F45j/+sfCtVosTvMVshP2pzUI/lQNPlIjnQoJP0pSTVhpULEX/JxQug 3wIw== 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=put97/wb1qdT4aCnbNxDC8Q8ewMnjFCWTT0woV4G33Q=; b=pFDa0LhwJTtrAVkP5zDgOkJOBUTpJPdA/Nua+ojzpBWeRk8sa1g8DQ1Osq0cH8dWmk GFpMS5zsAy3k8NMfWTUMht8b/of9XBb+lJkk/vy0o0uwpQjhT6XDX7foGOK1sjiLZNOi jIVTWFjhPKZhUF2By9pylWAyRdM9odILsnRth4noWUvWc/gTTxF+mv+4jvrklxI348jf CbqA9jle6cgRra6fjh6Jnjn8DTKnV6iTD19xXQxUYVQNHXkGna0EqwYr53Z67njOXXG9 h4HksN0SX3apB5BBzYaioizOBgViJaAPDUrZK9dfTej6EI7B4Ce8f1rAzLII/RWtUlPe u1jw== X-Gm-Message-State: AOAM532jWtMZfEZlmOqxh7gnk8yk0mANgRq+/DXVNVEfOQsFMKa5uOhr M0FBpZiXoe8pfh21Jtu9dw34pxIlSxNUrQ== X-Google-Smtp-Source: ABdhPJw9sZl+IGFXKPzGlQ2e9wD83q5x+Z/4VSI+3mnYmbzS8ZBzL9nWhMMLogqJLaJR0bF/Vv0F8w== X-Received: by 2002:ac8:5a86:: with SMTP id c6mr20753199qtc.88.1615212088002; Mon, 08 Mar 2021 06:01:28 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id t128sm7758282qka.46.2021.03.08.06.01.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 06:01:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Mar 2021 11:00:53 -0300 Message-Id: <20210308140053.162-1-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_slice: properly handle missing reference frames with hwaccels 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" Unlike av_image_copy(), av_frame_copy() supports hardware pixel formats. Based on a patch by Hendrik Leppkes. Signed-off-by: James Almer --- libavcodec/h264_slice.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index fa7a639053..0916de6cd2 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1599,13 +1599,9 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, ff_thread_await_progress(&prev->tf, INT_MAX, 0); if (prev->field_picture) ff_thread_await_progress(&prev->tf, INT_MAX, 1); - av_image_copy(h->short_ref[0]->f->data, - h->short_ref[0]->f->linesize, - (const uint8_t **)prev->f->data, - prev->f->linesize, - prev->f->format, - prev->f->width, - prev->f->height); + ret = av_frame_copy(h->short_ref[0]->f, prev->f); + if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) + return ret; h->short_ref[0]->poc = prev->poc + 2U; } else if (!h->frame_recovered && !h->avctx->hwaccel) ff_color_frame(h->short_ref[0]->f, c);