From patchwork Wed Oct 24 15:05:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10768 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 8C77E44B3CF for ; Wed, 24 Oct 2018 18:06:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFCF068A590; Wed, 24 Oct 2018 18:05:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F14168A568 for ; Wed, 24 Oct 2018 18:05:32 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id b9-v6so2040505pls.7 for ; Wed, 24 Oct 2018 08:06:00 -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; bh=1B5B/Rrb3djPDvZcp+pN0In+Ex+U7ICkeh7WSeeCpis=; b=g9jEUhreRBGhkOKDu7v1MYzUvcrEc+CorooXkix5SVTrw8PKo+4iOMHUb2k9XXJ6vH VNxoE4dtu31agqef6I46xHyOL7tTsQi4okeHWOVEKWY5aSgNhsfI4oyJDtQ6SfuFAJhQ k8yQZpB2o1LFTTozE++XeOhKdVsCllKlxpe2/4SG5ACIv7NtzD8iItSrlj/hKsWyf0Ao X0Xx7ODuLHH4U0zT7O6bKL2bXpszv6iALAPUhwxOnl5QudaLNEidJR8VTka2GAk4c+m1 oHMZyam0bvmmgDRktpPuI2eiEAaKR7dkSDuz3bcZJ8OdsJEuCuCuLTZgLeOHK7dftxla 2Zww== 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; bh=1B5B/Rrb3djPDvZcp+pN0In+Ex+U7ICkeh7WSeeCpis=; b=csThg58isl60qQRR3Wht1FzdT0kzVeGc5o9xsmm//g5sL1O9BuG5GrfVPPw+YpRM0N DZ5+auYXdN6443QCDJFsegpcJc3GYtXDsWESDS5+tZwJ4QRy380ImUp2F8YbI1vqcACc mFDoSjvOgmMq8+axCVMhldu6cMJ+Q5aye5UbNYJMxP537GrSjvT6Z2Ye+hTvFPCFOKYU KemWk6hV5/5Y8nwuHgtS43X+y3iqzQOCPj2OBeTJcHiYRjwVbVC7bZW29R7WggIbkmaT fCX2hKI09hKOXlHwIvY5eLUfnKBlVXl8ByiZzz5hogzoaqx2b1+L7t9U9puQDQUdp7eR BCSQ== X-Gm-Message-State: AGRZ1gKyT/lkzJWj9GZXRUvx5S//V+fkpOG5D85lLzrcqyC2vDvEFq+1 ESWpEG1UTJbNJBbXUrU+ECW7cQ30Qnw= X-Google-Smtp-Source: AJdET5ekN5HpJijXULmIqp1oFDQI8zHWAodUaMbXsp+Gb/aAqyxdu4+EeJThxNkHoCk9LOok4jRsTg== X-Received: by 2002:a17:902:48:: with SMTP id 66-v6mr2882029pla.7.1540393558889; Wed, 24 Oct 2018 08:05:58 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id n87-v6sm6427681pfb.62.2018.10.24.08.05.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 08:05:57 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Oct 2018 23:05:53 +0800 Message-Id: <1540393553-10656-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] lavc/hevcdec: HEVC decoder getting format clean up 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: Lin Xie , Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Add checking to avoid calling ff_thread_get_format repeatedly whenever new slice header decoded. Signed-off-by: Lin Xie Signed-off-by: Jun Zhao --- libavcodec/hevcdec.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index a3b5c8c..16032a5 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -317,7 +317,6 @@ static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps, const HEVCWindow *ow = &sps->output_window; unsigned int num = 0, den = 0; - avctx->pix_fmt = sps->pix_fmt; avctx->coded_width = sps->width; avctx->coded_height = sps->height; avctx->width = sps->width - ow->left_offset - ow->right_offset; @@ -357,7 +356,7 @@ static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps, num, den, 1 << 30); } -static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) +static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps, int force_callback) { #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + \ CONFIG_HEVC_D3D11VA_HWACCEL * 2 + \ @@ -366,6 +365,8 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL + \ CONFIG_HEVC_VDPAU_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; + const enum AVPixelFormat *choices = pix_fmts; + int i; switch (sps->pix_fmt) { case AV_PIX_FMT_YUV420P: @@ -418,6 +419,11 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) *fmt++ = sps->pix_fmt; *fmt = AV_PIX_FMT_NONE; + if (!force_callback) + for (i = 0; choices[i] != AV_PIX_FMT_NONE; i++) + if (choices[i] == s->avctx->pix_fmt) + return choices[i]; + return ff_thread_get_format(s->avctx, pix_fmts); } @@ -439,8 +445,6 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, export_stream_params(s->avctx, &s->ps, sps); - s->avctx->pix_fmt = pix_fmt; - ff_hevc_pred_init(&s->hpc, sps->bit_depth); ff_hevc_dsp_init (&s->hevcdsp, sps->bit_depth); ff_videodsp_init (&s->vdsp, sps->bit_depth); @@ -526,10 +530,11 @@ static int hls_slice_header(HEVCContext *s) if (ret < 0) return ret; - pix_fmt = get_format(s, sps); + pix_fmt = get_format(s, sps, s->avctx->hwaccel ? 0 : 1); if (pix_fmt < 0) return pix_fmt; - s->avctx->pix_fmt = pix_fmt; + if (s->avctx->pix_fmt != pix_fmt) + s->avctx->pix_fmt = pix_fmt; s->seq_decode = (s->seq_decode + 1) & 0xff; s->max_ra = INT_MAX;