From patchwork Mon Apr 3 12:25:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 40979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2685493pzb; Mon, 3 Apr 2023 05:25:59 -0700 (PDT) X-Google-Smtp-Source: AKy350Znm7AdqVxIUulNkqQfgXRp5zGdIrS+0PB8cmr2vRcXQ9prQy1cKFNcby69rwAQ2nqntmUQ X-Received: by 2002:a17:906:5811:b0:931:d644:b9d3 with SMTP id m17-20020a170906581100b00931d644b9d3mr35695476ejq.59.1680524759304; Mon, 03 Apr 2023 05:25:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680524759; cv=none; d=google.com; s=arc-20160816; b=fFe1pip+6UROMVbpTdj3xvD+vKS8Tt0zS4FbE+jXSg84OW3f6XFyRWwno6u02Yl0M1 38LgJg6rHGdiSxa2TmSyFndmdOB35Lg4D9MfhT9rOOlvjOTn7Y7ZFaGEnbE8d5lBM+l9 cp4O0QeRBJKoyw+4PS5OqRoIjdZjja4s1sQ41+K2DSkvbonHLzpUU9VL33VTsHmrKSGF 1r1YsAgjuUg4SWSjXR/zfiGs5ePBj7+nxFgOe2XWSycE9pp+grKJyfbz5OWa130lsreB 2znB2WKtPKjlmi6UQ13TQidu48BhJelkoW5aiwGKkbLZdJdpo4+fWG9oyphc0qZHfWR7 x07g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=EkgGsBN9Rr1EZOWCvuR8bAR4nd+nAFEh8rIoCz5PmCo=; b=kMVJ0o9/B24mYCwqnlaJSwrkfDGahqBWsIiMiqVKTillU8A66DPGuoSxOaI5Xxxiix 6uRSc726R9CF+DQEYHwQSK2sco070zfDmspRAIhGqy6lqFDyHYcFynNqnObzz8rUO8IU RT7kfZzj4NS4cRoEanGhJvWdQp4FNpkGd+PIuqrGFQPnaSDK4ICypR+MhcPr/nQGTha8 ENQtu2pR5sdSwmYcv4FtQUxWuzs/DPNz9FmB+kS+t4ZvqwPPT7H0/dHy7T7aNJMElxeb mdY+3JB/46VPwzFdYwRhNdMbW3hpPe8n1a+ZO/ybbUoCsyfg6iVhgMBgsrgOoGttj5zB PhVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Wxu2BW9s; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24-20020a170906351800b00930458d0653si7541434eja.775.2023.04.03.05.25.58; Mon, 03 Apr 2023 05:25:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Wxu2BW9s; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2143468BE84; Mon, 3 Apr 2023 15:25:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CA4168BE63 for ; Mon, 3 Apr 2023 15:25:39 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id l27so29155380wrb.2 for ; Mon, 03 Apr 2023 05:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680524738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WzOBUREJdpTKKWKBwt1ITNJyzgtTeEwUW9auZ6gcwKQ=; b=Wxu2BW9sie5eJx3YFScqzxn0254dTp36xOEBMs/7ORMQR0DI3UyEENfwze+jwK38zt yY6IInYwCgAIcaIF4mZSfTSgbKok8ShE0wRzuOukGo/OxeJZtQ0nzm148lFTzeXYbKgI NtuQezbwQgb205wmCa0VJWxxwsINxxgZfpA9zfK4dG+BMJsTfB1A5G+zWb+2bv0bOUma omk0whL/4joP6Mh9QE1LoiAFPm2jfpT1ygSMd5siVtRsJd60WJTelZ01zmd4j08bJrah ai63ILn/zqqCF8+kAs8GgxGrgqb/nDtKIv1H5z7FjHP7D+gSqM5ytbDeyOR5W/H3b957 QLmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680524738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WzOBUREJdpTKKWKBwt1ITNJyzgtTeEwUW9auZ6gcwKQ=; b=gbnhedG9XCVDNFMFJlhPBWWsQqDt/x/7QFKJCsp4Gxg4QVjHEaTnqyKzOSGpnvjyda roDKkOeGDr61p6nI3dXnuVhYKArjX1CUkErZxnTDMu34cemhvjxYapJSss4sns02yGB+ rsh6BsK7cTa0FimI2goHVvfePmoxTqzMI6WvFmxXV9W0QARFLcgR3Yf/hlnxscxlO/E4 3bendLFuDQhHx9Je8p01IRfeg6Sau6TZHE3De2X4O8x7JUWubMRn9ebvG0yfmu7V5mf2 fP5pqF7QSFXLwS6P3Jc8VtF7A+8f1odbV4tZGPrm5lAACXcq+JtrhXkHWFRCfSsezGq0 DxzA== X-Gm-Message-State: AAQBX9dL5xm3eaVyUIg2Z0McuPvGubcCh0yUN9iB/QVOLgu5+K7F3Orx ilAGjD32iP8J8AuIxAd0TI6zZLwEUQ51Rw== X-Received: by 2002:adf:edcb:0:b0:2ce:a828:b248 with SMTP id v11-20020adfedcb000000b002cea828b248mr25992850wro.71.1680524738283; Mon, 03 Apr 2023 05:25:38 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id o18-20020adfe812000000b002daf0b52598sm9672610wrm.18.2023.04.03.05.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 05:25:38 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Apr 2023 20:25:18 +0800 Message-Id: <20230403122518.1132660-3-mypopydev@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230403122518.1132660-1-mypopydev@gmail.com> References: <20230403122518.1132660-1-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/videotoolbox: fix warnings X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Jun Zhao , Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gUFTcSSbh1wi fix mixing declarations and code warnings Signed-off-by: Jun Zhao --- libavcodec/videotoolbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index e42fea6f32..6444325591 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -799,6 +799,9 @@ static CFDictionaryRef videotoolbox_buffer_attributes_create(int width, static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec_type, AVCodecContext *avctx) { + CFMutableDictionaryRef avc_info; + CFDataRef data = NULL; + CFMutableDictionaryRef config_info = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, @@ -810,9 +813,6 @@ static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder, kCFBooleanTrue); - CFMutableDictionaryRef avc_info; - CFDataRef data = NULL; - avc_info = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, @@ -1072,13 +1072,14 @@ static int videotoolbox_hevc_end_frame(AVCodecContext *avctx) HEVCContext *h = avctx->priv_data; AVFrame *frame = h->ref->frame; VTContext *vtctx = avctx->internal->hwaccel_priv_data; + int ret; h->output_frame->crop_right = 0; h->output_frame->crop_left = 0; h->output_frame->crop_top = 0; h->output_frame->crop_bottom = 0; - int ret = ff_videotoolbox_common_end_frame(avctx, frame); + ret = ff_videotoolbox_common_end_frame(avctx, frame); vtctx->bitstream_size = 0; return ret; } @@ -1132,15 +1133,17 @@ static int videotoolbox_prores_end_frame(AVCodecContext *avctx) } static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) { + int depth; const AVPixFmtDescriptor *descriptor = av_pix_fmt_desc_get(avctx->sw_pix_fmt); if (!descriptor) return AV_PIX_FMT_NV12; // same as av_videotoolbox_alloc_context() - int depth = descriptor->comp[0].depth; if (descriptor->flags & AV_PIX_FMT_FLAG_ALPHA) return AV_PIX_FMT_AYUV64; + depth = descriptor->comp[0].depth; + #if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE if (depth > 10) return descriptor->log2_chroma_w == 0 ? AV_PIX_FMT_P416 : AV_PIX_FMT_P216; @@ -1194,6 +1197,7 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) VTContext *vtctx = avctx->internal->hwaccel_priv_data; AVHWFramesContext *hw_frames; int err; + bool full_range; vtctx->logctx = avctx; @@ -1241,7 +1245,7 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) goto fail; } - bool full_range = avctx->color_range == AVCOL_RANGE_JPEG; + full_range = avctx->color_range == AVCOL_RANGE_JPEG; vtctx->vt_ctx->cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt2(hw_frames->sw_format, full_range); if (!vtctx->vt_ctx->cv_pix_fmt_type) {