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 ESMTP id 10AB1498F2 for ; Sat, 23 Mar 2024 13:06:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 298CB68D55E; Sat, 23 Mar 2024 15:06:27 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F32168D4E4 for ; Sat, 23 Mar 2024 15:06:19 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=nTbnqp4j; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 33C174D58 for ; Sat, 23 Mar 2024 14:06:19 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id tu7DohYMDTfC for ; Sat, 23 Mar 2024 14:06:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711199176; bh=Y7BYBVKSt6NHJzy9ZM01HOqiWJZ6pCkXRbXYUB3Da74=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nTbnqp4j+MRb5hVuFF32jGwymn6LZt9hEXoXvvzL6/flNyFTqPVYMSls7hPr3k8Ws 9Dv2nSz5sLX/EOz7QRx6dcve5jbWiiaSA+Mb60aVae8+iqsvHl5x3+S6HRosACt9OE mRkHtT9CiiLWc3eW/h9Z2gw/5J81yOIeBFdWcZn2kWQrVuoSvRS3oqhY3nycytrpVo EgXAxnemfxnlyBnd1QK+xuSePTbvmnugm78o9LgCNgY4kknrTLoZC5NIOQ1AHw/t7f YUd6QE/NGJOXH3ROTmbcef8r4q/nDnzwtaT4Iy2kA3/6NMmvXnMramS5HMs1qQ9l6d hmeT6RJNvpAQQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 93BDA4D46 for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 7C8F03A076E for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 14:04:08 +0100 Message-ID: <20240323130409.20925-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240323130409.20925-1-anton@khirnov.net> References: <20240323130409.20925-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffmpeg_enc: move decoded_side_data setup out of video-only block 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: Nothing about this code is video-specific. --- fftools/ffmpeg_enc.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 6a91fd0398..61310c67f1 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -187,6 +187,27 @@ int enc_open(void *opaque, const AVFrame *frame) if (frame) { av_assert0(frame->opaque_ref); fd = (FrameData*)frame->opaque_ref->data; + + for (int i = 0; i < frame->nb_side_data; i++) { + const AVSideDataDescriptor *desc = av_frame_side_data_desc(frame->side_data[i]->type); + + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_GLOBAL)) + continue; + + ret = av_frame_side_data_clone(&enc_ctx->decoded_side_data, + &enc_ctx->nb_decoded_side_data, + frame->side_data[i], + AV_FRAME_SIDE_DATA_FLAG_UNIQUE); + if (ret < 0) { + av_frame_side_data_free( + &enc_ctx->decoded_side_data, + &enc_ctx->nb_decoded_side_data); + av_log(NULL, AV_LOG_ERROR, + "failed to configure video encoder: %s!\n", + av_err2str(ret)); + return ret; + } + } } ret = set_encoder_id(of, ost); @@ -246,26 +267,6 @@ int enc_open(void *opaque, const AVFrame *frame) enc_ctx->colorspace = frame->colorspace; enc_ctx->chroma_sample_location = frame->chroma_location; - for (int i = 0; i < frame->nb_side_data; i++) { - const AVSideDataDescriptor *desc = av_frame_side_data_desc(frame->side_data[i]->type); - - if (!desc || !(desc->props & AV_SIDE_DATA_PROP_GLOBAL)) - continue; - - ret = av_frame_side_data_clone( - &enc_ctx->decoded_side_data, &enc_ctx->nb_decoded_side_data, - frame->side_data[i], AV_FRAME_SIDE_DATA_FLAG_UNIQUE); - if (ret < 0) { - av_frame_side_data_free( - &enc_ctx->decoded_side_data, - &enc_ctx->nb_decoded_side_data); - av_log(NULL, AV_LOG_ERROR, - "failed to configure video encoder: %s!\n", - av_err2str(ret)); - return ret; - } - } - if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) || (frame->flags & AV_FRAME_FLAG_INTERLACED) #if FFMPEG_OPT_TOP -- 2.43.0 _______________________________________________ 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".