From patchwork Fri Mar 22 20:28:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp163838pzb; Fri, 22 Mar 2024 13:30:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkIpkqjk8AqIJQuKhxYJNwNNSqXlLsMIdjGHq2LvocwR4B2xUslTCUzn4yWNyEfzilMJgwWkcsvGjr3QuqbHeWqohy/DRwvruERg== X-Google-Smtp-Source: AGHT+IFxzketrONR4Gsamd8LwjP665e138DkiltKNF9usUEBX14q3AnPaO/n4pCS/0n8RRqZwgqK X-Received: by 2002:a17:906:c44b:b0:a47:357c:2d58 with SMTP id ck11-20020a170906c44b00b00a47357c2d58mr512857ejb.27.1711139443348; Fri, 22 Mar 2024 13:30:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711139443; cv=none; d=google.com; s=arc-20160816; b=qYfxHS5gq7bTGbq03q+vP0Wc7TLAzv20KU2wYW5ztVVfx8EBgxVEHt5hALkKu0nVmF mJjTee1b/GnVc2m1IA6onPBf7OdTQZ/aTbgSAu58qT+ZePuRvxT05eyH47iAPz9I6i1i vYcYp/zYcqFOtGjl7EQwgM31nrBoejYanSmJ1/zE9YjX5695A6r/8FafjyoZSd5/FPSj ljuL+5myDpdGBhAtq3OkJF0E+1Xnwb/uYd2sTvVyJ93LlnGfMP4loZg5mGGwQmLbG+oT 2jRwfpti0lLk8aIUPrD+tvbBvGGONakqpV4PKP3Mx3bzg0PGnJVIo9ay356xoWv+9PRz Zm4A== 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=F3CAaLSgGxkJui3ZOD6FP9KzEkgr2QDwkunyjCXVrJ8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HGHMiFAm/0AVBwpfZDD5ye5H70tV9g+4q6KuimAeHYO1qxluZZTvnP530dRg72sCCT 5BRks4dC35siO17QeIKkIFeQsgwNc1xE9JzW58x/P5EaTIs1KaxncF8pVnJEUd+mpF1r rPsMgWaKHIeWbYuFs/noh50AXoFXn2WQoK8p18LpVyFT9YP1Ujysd0sJbjoln3BKsKut koRWCqGOLlEqnqj7krvEFTJkzSdY3z1o09Knk5pm2l2A+CGvX4ATeoCNDfjCXbsjXCvy eCvBwkEibcKSNz7ydkDSRdYc/+heaaq3j4DMPZHkrWbA2b2sMx4OSvZR1l0QSv+zWges TvGQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=VHlYSTAa; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lv27-20020a170906bc9b00b00a46ee3c4a03si155582ejb.988.2024.03.22.13.30.43; Fri, 22 Mar 2024 13:30:43 -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=@khirnov.net header.s=mail header.b=VHlYSTAa; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E301368D5EC; Fri, 22 Mar 2024 22:29:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8977D68D5C6 for ; Fri, 22 Mar 2024 22:29:01 +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=VHlYSTAa; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 307C64D42 for ; Fri, 22 Mar 2024 21:28:56 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id wh-HSEggJzIa for ; Fri, 22 Mar 2024 21:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711139334; bh=djShET+ojDEM3fpXVmIGIysP3wK5Y2zTievHhRyMGNc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VHlYSTAaMwC3X+5jYJrhgzgflxtXMDF/N69rze8eC4zzvRbcnZE+G6uJORPWdEwst +hghAcUcum8GhscAIaZPeNmharnpKFL0erfPVbVLg2lo1q5hJvV1kcjNuVGU+lJ+KZ Fjvc+XdtZWLo8EzBobscNnqq23X9YVVdE0RflzOcrPYPjUqRAffMB/br3XY8zoAPaz u8SL8BTOGytp95Tln4R+yMNZ9g3bm/W/PnBX1MT8YjO9GCQCjEh+nAd3bJ4oDUXqp7 l8HC1841Pw6Luo46snZruo1X6MMx1sjIQY1Dcxy4lQh7snbSvuomKaWD6F8jxcD/Tn o8h3PbqR/LHRQ== 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 73D204D61 for ; Fri, 22 Mar 2024 21:28:54 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 867DE3A0F49 for ; Fri, 22 Mar 2024 21:28:45 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 21:28:38 +0100 Message-ID: <20240322202841.31730-9-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322202841.31730-1-anton@khirnov.net> References: <20240322202841.31730-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/12] lavc/decode: move sd_global_map to avcodec 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: rCef0rEuJzLU It will be shared with encoding code. --- libavcodec/avcodec.c | 14 ++++++++++++++ libavcodec/avcodec_internal.h | 16 +++++++++++++++- libavcodec/decode.c | 33 +++++++++------------------------ 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a9a87bb58c..525fe516bd 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -54,6 +54,20 @@ */ #define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) +const SideDataMap ff_sd_global_map[] = { + { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, + { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX }, + { AV_PKT_DATA_SPHERICAL, AV_FRAME_DATA_SPHERICAL }, + { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, + { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, + { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, + { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, + { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, + { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, + { AV_PKT_DATA_NB }, +}; + + int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size) { size_t i; diff --git a/libavcodec/avcodec_internal.h b/libavcodec/avcodec_internal.h index 4d1cb3a314..0a024378ae 100644 --- a/libavcodec/avcodec_internal.h +++ b/libavcodec/avcodec_internal.h @@ -25,8 +25,22 @@ #ifndef AVCODEC_AVCODEC_INTERNAL_H #define AVCODEC_AVCODEC_INTERNAL_H +#include "libavutil/frame.h" + +#include "packet.h" + struct AVCodecContext; -struct AVFrame; + +typedef struct SideDataMap { + enum AVPacketSideDataType packet; + enum AVFrameSideDataType frame; +} SideDataMap; + +/** + * A map between packet and frame side data types. + * Terminated with an entry where packet=AV_PKT_DATA_NB. + */ +extern const SideDataMap ff_sd_global_map[]; /** * avcodec_receive_frame() implementation for decoders. diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 34bcb7cc64..ddb73b6934 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1376,21 +1376,6 @@ static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) return av_packet_unpack_dictionary(side_metadata, size, frame_md); } -static const struct { - enum AVPacketSideDataType packet; - enum AVFrameSideDataType frame; -} sd_global_map[] = { - { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, - { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX }, - { AV_PKT_DATA_SPHERICAL, AV_FRAME_DATA_SPHERICAL }, - { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, - { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, - { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, - { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, - { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, - { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, -}; - int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, AVFrame *frame, const AVPacket *pkt) { @@ -1414,13 +1399,13 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - for (int i = 0; i < FF_ARRAY_ELEMS(sd_global_map); i++) { + for (int i = 0; ff_sd_global_map[i].packet < AV_PKT_DATA_NB; i++) { size_t size; - const uint8_t *packet_sd = av_packet_get_side_data(pkt, sd_global_map[i].packet, &size); + const uint8_t *packet_sd = av_packet_get_side_data(pkt, ff_sd_global_map[i].packet, &size); if (packet_sd) { AVFrameSideData *frame_sd; - frame_sd = av_frame_new_side_data(frame, sd_global_map[i].frame, size); + frame_sd = av_frame_new_side_data(frame, ff_sd_global_map[i].frame, size); if (!frame_sd) return AVERROR(ENOMEM); memcpy(frame_sd->data, packet_sd, size); @@ -1461,12 +1446,12 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { int ret; - for (int i = 0; i < FF_ARRAY_ELEMS(sd_global_map); i++) { + for (int i = 0; ff_sd_global_map[i].packet < AV_PKT_DATA_NB; i++) { const AVPacketSideData *packet_sd = ff_get_coded_side_data(avctx, - sd_global_map[i].packet); + ff_sd_global_map[i].packet); if (packet_sd) { AVFrameSideData *frame_sd = av_frame_new_side_data(frame, - sd_global_map[i].frame, + ff_sd_global_map[i].frame, packet_sd->size); if (!frame_sd) return AVERROR(ENOMEM); @@ -1758,9 +1743,9 @@ int ff_decode_preinit(AVCodecContext *avctx) return AVERROR(EINVAL); } - for (unsigned j = 0; j < FF_ARRAY_ELEMS(sd_global_map); j++) { - if (sd_global_map[j].packet == val) { - val = sd_global_map[j].frame; + for (unsigned j = 0; ff_sd_global_map[j].packet < AV_PKT_DATA_NB; j++) { + if (ff_sd_global_map[j].packet == val) { + val = ff_sd_global_map[j].frame; // this code will need to be changed when we have more than // 64 frame side data types