From patchwork Sun Jul 9 13:39:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp120730pzb; Sun, 9 Jul 2023 06:39:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlGxcDf0sDquGys/toQ3kKBOTBcWXBTxRbbxGsXrcqoN9Mu4MfLbLONCXNyeqPXQgExrMBgw X-Received: by 2002:a17:906:5a50:b0:978:928:3b99 with SMTP id my16-20020a1709065a5000b0097809283b99mr9559381ejc.46.1688909998660; Sun, 09 Jul 2023 06:39:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688909998; cv=none; d=google.com; s=arc-20160816; b=Ro5TLjVDPt8lJVKP1Ul2iM+FXPgv51x+8/UKLAIkF9iSI2B0HIZev5uff4UCNptyQ4 U28nBix1cePsINOyoSS7cFO5pTTAfQFHpZe1i3cbszqb3ve4U3qvOgarfVPxhpm/MFEz A6daP+bX0yl3b7vQzbEFnkFt99Nh4fXkvnVMTz7obDuXb7uzoEtrQKBhVqsyXypmZBbe QN4ALyeG/chetY1hOtcqwiPQ17ScZexlTA6eou5rFeImafg4gxGMoDH7vyeaCQ29tsc1 OAI8zlOEqb5geiOkFAod1MHCKBKiWkfSW01Bs5+wPjjR758sa3ux6y/r00pzMoMYaxAv wayg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=kovZtk7kPPI7AfAowW4YCmnrK/BXT2rA3LsQk9ntaeE=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=olFaZP/mZEPdGpxISkNhL1NjUq2sy/fTRaSS6GCXUIvXyQ1180SvQT2s3peAqYgjCv fqNn52Nb4Bvq44+jxzGpybbipTatxqROqXMHCfp5us+yEzQWvH53TDJgiJpQP8vr1a5S Dxcf44lhcm1VNTcYEhKLF+HAyegZ18BTk8K3LlLSdvSbEku3JnpRX7ad2C0ii980y0Yi kG2Gbhs68YUSyM+q3KmbDayl4UFPgVGsBePstU6a4Aih7F2uexF9FyhI9udNyPVE5RN3 xqhfqUtRaa5oDE4r37BfmOtsiRHvpbcan15hHnZAFHSnHZPt6xAYI4r+WZnRd6FS/oNP YGww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="k/WBsXKN"; 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 hb6-20020a170906b88600b0099309c64f17si5649475ejb.146.2023.07.09.06.39.58; Sun, 09 Jul 2023 06:39:58 -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=20221208 header.b="k/WBsXKN"; 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 58B1168C672; Sun, 9 Jul 2023 16:39:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF96368C654 for ; Sun, 9 Jul 2023 16:39:31 +0300 (EEST) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6b71eef1bc0so3000083a34.2 for ; Sun, 09 Jul 2023 06:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688909970; x=1691501970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+WpxdYp0oNuPlxDMcVcdypdrGayQ0Mzn0WzXYjO3WMI=; b=k/WBsXKNYW6ZcNpNUfA+n6d159A4ZbNAHvzev5TeqMxkql21ioG5AuWNu0UAAHvqrh pUPpG9Ez3L7yOJw6KyzleJT7cmfDabIhQC/NPW43pdZz0taracRPQ0fFlJhuzYOJY9Uq K2dK4AVj5IVK44Ovf7QSQXRbFLBThCFPP3ebDRn6SF6rpfM9nthBtjBkVUsx3/Fs6rNX 2o/GqOYTCoWMIKK8cDFHwx9l1Rzb6D6Pm8lVaeHMNMw1T11WrizjzIY21j+rTbTT2cdT xPOI/kQTyexMHExuQd+5rmir6SNKJJnunZevryGveXdJIy80pIAXzCE9OzGf3pkTVziz DR8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688909970; x=1691501970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+WpxdYp0oNuPlxDMcVcdypdrGayQ0Mzn0WzXYjO3WMI=; b=jIToup3FDxEBSPf3nLbaZOX1UoY9dM5rOXE3NtRTZKKMYKju9wtqb6vZL3PRRbeaQp IfxeR/d4zDS79WfJmM2O8rQF6VT10mpek36VuMzc/9EGg6J5FaN2VSJEri3tCf8YAAiY GblVbc5ysinxPrGWBlGvinfdrrR9pU0eHjWU/jzwo/3qHifc1pggNx6M+ftOO3Kxnwtp FGQXmAYr4EYJKqmzDkQH6jbVqF3GT8VHPrdLjoRbFV2NWm/A4HdvfF1hR/4vd1QqcVCh xoeCLTF9qsCJKcRK9ojqSjHcCA3RBjLWwLy0VjPYMW75cPIQr9eo30UHgv3tIY3TeBX3 fMbw== X-Gm-Message-State: ABy/qLZ5V0k4OQRGifyYB4P8HE2w0/c6I7HzJLBtPe7HAeqKatCsrGzv 9JPHyPuDbXFpJWRCbn4gEengRr+/UN4= X-Received: by 2002:a9d:6848:0:b0:6b7:4bea:76cd with SMTP id c8-20020a9d6848000000b006b74bea76cdmr7444028oto.15.1688909970386; Sun, 09 Jul 2023 06:39:30 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id r18-20020a9d7512000000b006b756242c98sm3404413otk.19.2023.07.09.06.39.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 06:39:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jul 2023 10:39:17 -0300 Message-ID: <20230709133917.5403-3-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230709133917.5403-1-jamrial@gmail.com> References: <20230709133917.5403-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec/decode: fill missing frame fields for all decoders 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qOf/0fMJdkI3 And not just those with the old decode() API. Signed-off-by: James Almer --- libavcodec/decode.c | 64 +++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index b3e4b066e5..080edb5996 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -292,33 +292,12 @@ static int64_t guess_correct_pts(AVCodecContext *ctx, static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *discarded_samples) { AVCodecInternal *avci = avctx->internal; - int ret = 0; uint8_t *side; size_t side_size; uint32_t discard_padding = 0; uint8_t skip_reason = 0; uint8_t discard_reason = 0; - if (frame->format == AV_SAMPLE_FMT_NONE) - frame->format = avctx->sample_fmt; - if (!frame->ch_layout.nb_channels) { - int ret2 = av_channel_layout_copy(&frame->ch_layout, &avctx->ch_layout); - if (ret2 < 0) { - ret = ret2; - } - } -#if FF_API_OLD_CHANNEL_LAYOUT -FF_DISABLE_DEPRECATION_WARNINGS - if (!frame->channel_layout) - frame->channel_layout = avctx->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? - avctx->ch_layout.u.mask : 0; - if (!frame->channels) - frame->channels = avctx->ch_layout.nb_channels; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (!frame->sample_rate) - frame->sample_rate = avctx->sample_rate; - side = av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size); if (side && side_size >= 10) { avci->skip_samples = AV_RL32(side); @@ -400,7 +379,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - return ret; + return 0; } /* @@ -450,14 +429,6 @@ FF_DISABLE_DEPRECATION_WARNINGS frame->pkt_pos = pkt->pos; FF_ENABLE_DEPRECATION_WARNINGS #endif - //FIXME these should be under if(!avctx->has_b_frames) - /* get_buffer is supposed to set frame parameters */ - if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) { - if (!frame->sample_aspect_ratio.num) frame->sample_aspect_ratio = avctx->sample_aspect_ratio; - if (!frame->width) frame->width = avctx->width; - if (!frame->height) frame->height = avctx->height; - if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt; - } } } emms_c(); @@ -619,8 +590,39 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) } if (!ret) { - if (avctx->codec_type != AVMEDIA_TYPE_VIDEO) + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + /* get_buffer is supposed to set frame parameters */ + if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) { + if (!frame->sample_aspect_ratio.num) frame->sample_aspect_ratio = avctx->sample_aspect_ratio; + if (!frame->width) frame->width = avctx->width; + if (!frame->height) frame->height = avctx->height; + if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt; + } + } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { + if (frame->format == AV_SAMPLE_FMT_NONE) + frame->format = avctx->sample_fmt; + if (!frame->ch_layout.nb_channels) { + ret = av_channel_layout_copy(&frame->ch_layout, &avctx->ch_layout); + if (ret < 0) { + av_frame_unref(frame); + return ret; + } + } +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS + if (!frame->channel_layout) + frame->channel_layout = avctx->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? + avctx->ch_layout.u.mask : 0; + if (!frame->channels) + frame->channels = avctx->ch_layout.nb_channels; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (!frame->sample_rate) + frame->sample_rate = avctx->sample_rate; + frame->flags |= AV_FRAME_FLAG_KEY; + } + #if FF_API_FRAME_KEY FF_DISABLE_DEPRECATION_WARNINGS frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY);