From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4FD204D946 for ; Wed, 26 Feb 2025 16:42:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D1BF68CDC9; Wed, 26 Feb 2025 18:42:14 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7477068CAB9 for ; Wed, 26 Feb 2025 18:42:07 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2233622fdffso16361675ad.2 for ; Wed, 26 Feb 2025 08:42:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740588125; x=1741192925; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=lh2xgBWACPcGtmxjchGXOA9GSDj7quH/qe7M06jODLA=; b=GP0PfB5YZEZRTfu13H9GCaVa130C77YHBdR5xYo6BHtLBNGKph5mbI0R0huw/408mk hdelv3/6egVo61t+mO+cCcnTkwcOjfhqbevcM3JeInhMZevC9eqfM2a0WUdv+m4QdBwN Zm3KW/Va7yKbJ5BiUvn0vtcvTGx0LID2/MmEp9DI4Zu4eT748n8PhZiqi6Sfx+lpAaQl 1cWl/Jyg8553DMhs4s2zAOdoKTQ8huj81ePLjhjlMSqKKk0qJHfsteQvjTEN7sC0tEok m6ds1DSSCQP1UQ9vauaEOlbuIkAoKWLAYWbk7mUY+PMNntzQbVCxe+BaqpqGSTEsweYS mGgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740588125; x=1741192925; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lh2xgBWACPcGtmxjchGXOA9GSDj7quH/qe7M06jODLA=; b=Ydf50r7fwL8GzFRs/qmbh1/fsLGaY15jmWJV1CJ1NS9EEWHMgx0YlIO7p3KzgOCK36 N3+/7zv7lFzQNV1fOh6hg/HcsX55V+0zCNq8nHMbsgBLKx0NgpADH03uukquC9sLgdAz qrGLzGxXalfr78ulzvY62UHuEKr1G6kgrmVVTjFz/vT05wg3fjDj3fB5l1URGS8ezciL lRvCyuKcwrcDJyMp763G3o+giCJ8Febd9M1nLQrur6Xe5e9YZQPqeaYU7hOJKwmeQ+RK pXM3Cc6Gu4NWjI9I268MVDmE5nLah+DKtzmshR4nkVoX/g9607WVpGNFIruu6O7V2UNh z1dA== X-Gm-Message-State: AOJu0YzugWTPVAmDo1XJXkZuqMcpTioAfhfTjI9sLFQNum5lwsLkU1ym tzRWTIqKa4h2mdBR+W5guPH6y467DM2fmE9DaYUw1sHD9YQ5PniCBxt7iw== X-Gm-Gg: ASbGnct8lrebzkg9uJXR3LTSyWDS8wYkQMJSqtek4gidQ+RR9zBPCJCcZsEUEL3Fm4u KaOMubiIHdafPkuQabLemS7t1UPnuT0JC32xYBybqo5IgXOlQNS/6JAI2+eWYjpO33Eci1XyIjq QNzsXEjVW44S9/ZCFSkVQnl4cjaudcG7PDSOhSgmjDDofqhUa+9EBri0iN8qvqb5zWmU+KX5Cod n79VsUKU/7DRjY3qHR6kJyfdSszYavvI3w5HrU9B4fPAuDVu+zg+1TD3677juaq6oYkTrl7s68w EYk9eJ82/41JYNkXxjDaMsIUnnoo0HOBp4Gy1n5O6w== X-Google-Smtp-Source: AGHT+IFdgRTgoIj3JHtg3XBnw0QlWLdIVjfFfVAct58CXNabnJ0TCwpAIZ3rLAml/F3QmBFK9uDxDg== X-Received: by 2002:a17:902:f681:b0:21f:859a:9eab with SMTP id d9443c01a7336-22307e65a94mr119323965ad.37.1740588125169; Wed, 26 Feb 2025 08:42:05 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:a864:32e3:9d43:17d6]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7347a8393ffsm3768201b3a.170.2025.02.26.08.42.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 08:42:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Feb 2025 13:41:49 -0300 Message-ID: <20250226164150.5461-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: inject missing global side data to output frames 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: ff_decode_frame_props() injects global side data passed by the caller (Usually coming from the container) but ignores the global side data the decoder gathered from the bitstream itself. This commit amends this. Signed-off-by: James Almer --- libavcodec/decode.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index cac7e620d2..c5a577f4f1 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1570,6 +1570,15 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) if (ret < 0) return ret; + for (int i = 0; i < avctx->nb_decoded_side_data; i++) { + const AVFrameSideData *src = avctx->decoded_side_data[i]; + if (av_frame_get_side_data(frame, src->type)) + continue; + ret = av_frame_side_data_clone(&frame->side_data, &frame->nb_side_data, src, 0); + if (ret < 0) + return ret; + } + if (!(ffcodec(avctx->codec)->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) { const AVPacket *pkt = avctx->internal->last_pkt_props; -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".