From patchwork Mon May 18 11:11:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19740 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 0867444B9D4 for ; Mon, 18 May 2020 14:11:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5D1468AB43; Mon, 18 May 2020 14:11:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B67D68AA9C for ; Mon, 18 May 2020 14:11:19 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id c75so3644932pga.3 for ; Mon, 18 May 2020 04:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fE58YcVIgizkMOg6G3hMgg13Xo6nk3FZGSKZkVNJ1d4=; b=cKT6tD+g2GsLFcYS+YopX15ZWWn393X8qX3AMAtdTTDcmTh2z7lpoOMFC6e8Bp/VoK cl9fo4nWV+otZ/nWzWS1mDO0dR8PQ2VY1OJs95tepHYdT44GvYSZskgM90RuXLBkdJv0 u98LDDh387pobfEkzMv+84nYo6D6qwgganWgQjs3Ce6H3E5/xmA2VqwQo03IXmrltBYa CoQqsL+eVOT5W8Cp+aRgmO11x0WUE26Maoi9N6PEALvBgKpsjr+Eeb3IBtNEkBS9yhBR HSSJbfkoWqxcPQ9cftWvbOM3exFIDggpuHul9TZFsgmJFcIizRHECqRCtOge9p2hotxC dG7g== 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:in-reply-to :references; bh=fE58YcVIgizkMOg6G3hMgg13Xo6nk3FZGSKZkVNJ1d4=; b=etTJH7bidVqfPVV/1kTEGOaLguhYj4SyzZ15TGMAAVACdWymGAaWrWz9ujYdfpte8D MBEFMZOn+yKS/KucNvThUeV3NcupDPHHtzRyzILBND74nRnR9Vo8av8bHM95YMZ26kET 3abAOYJxzkZ2dcjdbM32nzl32IDNJMCsj+9inxGgPfstfO1U3oJSrh5Ta9KMiwbW/m5v YkblsnqdN7H8FEg8v8+1EbIQ14jE2JFBgV2JWv5hBtUnVZNYikWfn4ZgaV9bmHaUQYrQ 45t6CXPFYQiv+ecV3B+rSXsEEEsE2PDHVHtyOhkCxRZxjFT718ToK7feyIzpIZTtOQOu KU3A== X-Gm-Message-State: AOAM531xfd8JjXatbMC5UwpKsxAgHy25gCJ+mb5zG2M9z4LvenwgWeOP G3L2byRwOOcN8fR2I1jBELd8a4Fj X-Google-Smtp-Source: ABdhPJzTIdlSc2DNh0oDlePikZw78C0gqm/35wrnncV9SzkIH2UsT9uW2kEwQb49PUTYMOY+qZOSfw== X-Received: by 2002:a63:7e01:: with SMTP id z1mr139651pgc.132.1589800277679; Mon, 18 May 2020 04:11:17 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q34sm480545pja.22.2020.05.18.04.11.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2020 04:11:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 19:11:09 +0800 Message-Id: <1589800269-30359-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> References: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/h264dec: Add FF_CODEC_CAP_INIT_CLEANUP 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang then ff_h264_free_tables() and h264_decode_end() can be removed in h264_decode_init() if it's failed. The FF_CODEC_CAP_INIT_CLEANUP flag is need for single thread, For multithread, it'll be cleanup still by AV_CODEC_CAP_FRAME_THREADS flag if have. Signed-off-by: Limin Wang --- libavcodec/h264dec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 4c355fe..3478b38 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -226,7 +226,6 @@ int ff_h264_alloc_tables(H264Context *h) return 0; fail: - ff_h264_free_tables(h); return AVERROR(ENOMEM); } @@ -418,7 +417,6 @@ static av_cold int h264_decode_init(AVCodecContext *avctx) av_log(avctx, explode ? AV_LOG_ERROR: AV_LOG_WARNING, "Error decoding the extradata\n"); if (explode) { - h264_decode_end(avctx); return ret; } ret = 0; @@ -1036,7 +1034,7 @@ AVCodec ff_h264_decoder = { .decode = h264_decode_frame, .capabilities = /*AV_CODEC_CAP_DRAW_HORIZ_BAND |*/ AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | - AV_CODEC_CAP_FRAME_THREADS, + AV_CODEC_CAP_FRAME_THREADS | FF_CODEC_CAP_INIT_CLEANUP, .hw_configs = (const AVCodecHWConfigInternal*[]) { #if CONFIG_H264_DXVA2_HWACCEL HWACCEL_DXVA2(h264),