From patchwork Mon Jul 10 21:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42585 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1020046pzb; Mon, 10 Jul 2023 14:55:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHP8Vjmkso82GWuoJZoZQyQN345U9uThvqIF3zJEIU/FNKyN3fYErghCPTADAUZo94yyRGX X-Received: by 2002:aa7:dd0f:0:b0:51e:eba:55ba with SMTP id i15-20020aa7dd0f000000b0051e0eba55bamr8075268edv.32.1689026126224; Mon, 10 Jul 2023 14:55:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689026126; cv=none; d=google.com; s=arc-20160816; b=1LlH2+x3JUuWq2lY0eYz0JjyqlsEP6p3tKL77OLGaOULJvejqIYu6t10sKd8932oeM DwXK3JdHEGmTvyyr0fy4KkL7VRZA0tpKIdDVV5rjz9i8vcAUSRRiLd8APuDcyDbEyPEN uVMlMr86DST9Xap2lOLcCwQRp9ShXrHTpF3xeu8wVfoykjqDYVEnrpQriSwIaqkQK9hE 9/9LDFtxuHYJM6FFt52pKYSXc2ZBuYzl5ATFKH/XPIcTxGlIXy3h2ZbZ8uZcKB5QlZS3 wPPhYZ9qfBYkn7rTyplOxINIx/LENSlDGHxCDY14R6YBDBq3QKm2JUIW2I9pPk5V1P6x +rJQ== 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=e/mSPXlbILu2hhBRezqBMpVwFOEOIy8vzW7Pv6rqbY4=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=YQESHumHMUQ0maGvoekyJcWg6EK0/NCYlI6po4OhJDSbeuHcyuFaJFkJfSxHlGqNpF 2SD8Gw3eZDQmCfkHXyH6kWUERmpE+sY+pZkaDXRmCnVZjZ6WENIbE/l5p5i+PZytLJfe BVX68W3QKnZ93XDdXYwnNGXBx+WrvIBRjwpDJlONwCzLcUx8PURD2wa/q8sXw7gmc7vD vFwlmiFmZImUDdlhp8E7hHmbCBWn7xf/2vYWSMQ1jYSZUvLyOsNGc9bu4MF0kHzPY3su v7cpfnnuqlPRZR3QigE5m4/7cFcw/Z+N5W2VEPyuKjbD6uyZbojnBGlb+sY3dT48xo4E YJ9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=BnhL3VkX; 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 x19-20020aa7d393000000b0051e167b996asi447078edq.656.2023.07.10.14.55.25; Mon, 10 Jul 2023 14:55:26 -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=BnhL3VkX; 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 D120A68C5B4; Tue, 11 Jul 2023 00:55:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF53968BEF2 for ; Tue, 11 Jul 2023 00:55:06 +0300 (EEST) Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6b74791c948so4404031a34.3 for ; Mon, 10 Jul 2023 14:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689026105; x=1691618105; 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=IZSuKLcJxlXZYGHEt8OlDj9W8ZGJOYCAfSxwGQoFCoE=; b=BnhL3VkX0ze3T+XZme2GeXk8lb4tbSc1ciQLk8yzNABstDaYy5o+WHDAR8EmOUMVOu 2EsV+RVL+HLSgDcNT47s3BNewpnihbltmwbQKyUtLP6Kb3+a/hTSiqYjutOaddz073rl Ze+2nRJSkTI3eyC980pD2jAc3H7ccKvRhVGMxbS5jlTaHOYhuESu8i7sj9NpjWvnDbOJ IWXKygpTzuewyEjsjeSQS+hr/uQJNpHeBPQEcaKXB57aHa9lYK5J0R8naTHFy9FmSLwY TmgH0WXQXTEZYwfwENTq1kdiegOGE3Ay/xYiRxWyqUbwHMq87rE28XLDariRrFsci7ip TWOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689026105; x=1691618105; 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=IZSuKLcJxlXZYGHEt8OlDj9W8ZGJOYCAfSxwGQoFCoE=; b=LNJdfo7AJunFv46dSVf/DyHDyeCqzobmQx6s2lZmDOw5ZZx3aS1PbzkWIHP3rBDX2T 2mCAWITcdrYJXtrFNqJGW6TY85CYjBxTvJUQD00g3QfI/DzgvbYusHLyTpJKjpX+e8wF mTlWlWMiv5JZyGo0Y9H6jDtBotLuDkKQ872scmmvMjL2in6r4AL9DNB8NzTgPod2QMP1 Wn3Y39FUaGpsXOyDrpEEUi7VzXyxSMER8ow5JPkKNtpw4eVVOvfLfHY4e6FNkBZS+e6S dySp3aVHJRouvge9bxEF6fXfjYXkdBEoOh9dMR6kRn4V/Eo7t2hHvU/H8qJxPtw9Mbd7 xVUA== X-Gm-Message-State: ABy/qLZH6VNi2bF1NsXCCYyRDKpxYnwDrAfbL3Xbol9hVGGX7JB9BPa2 VHY0teUtuwLbJkPBW5eq0wiW+V3PRLc= X-Received: by 2002:a05:6870:548f:b0:191:f657:13ee with SMTP id f15-20020a056870548f00b00191f65713eemr17217219oan.11.1689026104749; Mon, 10 Jul 2023 14:55:04 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id dy45-20020a056870c7ad00b0019ed19a8659sm405446oab.8.2023.07.10.14.55.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 14:55:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2023 18:54:52 -0300 Message-ID: <20230710215453.34421-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230710215453.34421-1-jamrial@gmail.com> References: <20230710215453.34421-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/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: v9F5PoxhuE8N And not just those with the old decode() API. Signed-off-by: James Almer --- No changes since last version. libavcodec/decode.c | 65 ++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index c9da8f685c..1270acaa50 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -292,7 +292,6 @@ 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; @@ -313,26 +312,6 @@ static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *disca if (!frame->buf[0]) return AVERROR(EAGAIN); - 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; - if ((frame->flags & AV_FRAME_FLAG_DISCARD) && !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { avci->skip_samples = FFMAX(0, avci->skip_samples - frame->nb_samples); @@ -403,7 +382,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - return ret; + return 0; } /* @@ -453,14 +432,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(); @@ -614,8 +585,40 @@ 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) { + //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; + } + } 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);