From patchwork Tue Apr 2 19:04:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1554209pzb; Tue, 2 Apr 2024 12:05:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXkNmPcm746s4MBhhF/J06LHjUat9J+RPIzM0QWddNp+vLNtbwI0N35jlfYOQ4CerAEbK/7krNAVaRkqucCiifwmSrvp/vObSbBuA== X-Google-Smtp-Source: AGHT+IEKDOkghUkKo8mDNm2DZh7B0VrqknOWE2uzKAzbccsu7Tq9my/ON6GOkY8zpt/wcD1QS8wY X-Received: by 2002:a17:906:380e:b0:a4d:f47a:2a07 with SMTP id v14-20020a170906380e00b00a4df47a2a07mr9982994ejc.38.1712084706034; Tue, 02 Apr 2024 12:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712084706; cv=none; d=google.com; s=arc-20160816; b=lo93WufTNDocQwI05SjNnet1oG7CFm8/lWBOkJy0LSfU03ICH2Vl2XLrsj4qxf33Rl RfHQ6zu8tDhBsKqEKYPW4RsGEhw92+xldE0C1yxs+ufi2RA4zLlupDEVMA2bHC5B0f85 czOg1Y0gpOQUW0GZflUOZszsn4NP8HpZ3iBFJFMuANupl55hqoFzx5Lb/xQWQkVPWQuE SmuN6dAtpbbau/s+nmQ6Jss3oMqHcY5E1OOUxB/Cq4dJ28kTh6OMBCoaTXUcR/c5jN1i zte64qiPXRUQ30NDLuYi8LTYJxJcXtRngmh/ZdMF63OBnTpC0Ij3qx3ZQwB57e4ok1Xx 6yRw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=rauoo39ZZmjtdtny0g7JvWpstGb/rhoObY/+N7hemKQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=eCqBU+rMLJ0IAA0LYqULjpp4Ai3vswqYdWuVkcHtVk69PUMM2lzsB9gMPIgaoNBVR0 sQw6dkomDcb8Ax8Br89HD0albeUoB0sQg/a6YoOyFgpdHjvS384bNtaXN/en5MeI/le2 XP6elqM3p25A7/HSloSvbXnJarIW1d0kF0nSjMIEU1ZcLuSzNEW8VCKxLZWy2dzl+foV iHRm2eZutKEV9MgDMJ9f+rJ1In5VF0gky+DdpsJ+9MwdKkbUJeLdP8HU9dGPk7HdBZ1I T+5ID2Rkm3bxpiZfjeb1qQV6oPHilo3OKO7I8Mha1sYwfc1X/T8rpoMS6wUafJ2MuXyG Al6A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ly8W5aVf; 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 ds18-20020a170907725200b00a4e8535fe4bsi1201780ejc.641.2024.04.02.12.05.05; Tue, 02 Apr 2024 12:05:06 -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=20230601 header.b=ly8W5aVf; 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 63AE068CAF0; Tue, 2 Apr 2024 22:05:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67D2168CAF0 for ; Tue, 2 Apr 2024 22:04:54 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6e6b6f86975so3711645b3a.1 for ; Tue, 02 Apr 2024 12:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712084692; x=1712689492; 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=pt1brWKMOH/hg5YxhGaw9PH+3Yaj4OPRjJk5STQ0J5w=; b=ly8W5aVfaK3ZIDhz2r3Swqz+nUfm9YgjfAHPCNJtHzAlU72M6YvLNfhYSQP6nj+JKs 7B+pNe87/ni1QALxrVGtNnx74Hg3sY0xmOZiS3E7hniLxpIVNBrIj29+M1rSGmEQhIws k0BW4SW7gbtEuzYr7bPo7KIm16AKw4CvCfRiN84KgTc7SuHyFlRRRm1RR8EV86zAOmb9 3YaK3D6JzkRE1o7DUmthE/k6dqOJbj/HhikoWd63c4Q+vgBuwBd0KCmhjkC4kXNarYK1 gyi8kLLGYeqZ9Uu9ViDkQfVKMiI9jD5ZaNuXLFpkmmZtg8PyvZlfZXEqH9Y1qICwqJdn t2iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712084692; x=1712689492; 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=pt1brWKMOH/hg5YxhGaw9PH+3Yaj4OPRjJk5STQ0J5w=; b=ZU8IdRZBMbZa7BM86nWpat1FKAtcqtmmranZu4rqMlryfCOwLMlU+WIl66pHa7IkPL eUF56kH8JOulimsmcUPg8UlaI6XQTW2pZW8UyJjXtNuOObRzKKadW4YWUspwCppdyqmz hJbU7XZ3RlELofzhs4F3mSzGGZwuVoiMiznC8B/pOopMl9XUUY9gOZC6nazD97BMxL8l XAUUCfUilWZuKd+df4PG2+9Crl3XFGVyITowkTM1mg1o54p+20uINfyUBjObsZgDByY0 Z25DG7MWLJnXPAQP7ArfRssT2U2tEoIZT0qxSnVs/GVmWMt+m7gOP2sAYxAxPtF8OAyQ l8Kg== X-Gm-Message-State: AOJu0Yyet9IK52z2SFmiZaRQwd80H3oVZeigcRjY0iS3dTyFcs4lDOi/ UiLmIB2KGV+g1j+h/Y2jttAd8gu8Z5pOA8p4NwpfvolEdJ+RRPbgXmzJ+4sn X-Received: by 2002:a05:6a20:a11a:b0:1a3:48c4:10b1 with SMTP id q26-20020a056a20a11a00b001a348c410b1mr926399pzk.40.1712084691413; Tue, 02 Apr 2024 12:04:51 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id y15-20020a056a00038f00b006e6b2ba1577sm10191331pfs.138.2024.04.02.12.04.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 12:04:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2024 16:04:50 -0300 Message-ID: <20240402190450.10623-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/vvcdec: move vvcdec.{c, h} to the top directory 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: XpSbkPZeNZ8b As it's the main file declaring the AVCodec. Signed-off-by: James Almer --- libavcodec/Makefile | 1 + libavcodec/vvc/Makefile | 3 +-- libavcodec/vvc/vvc_ctu.h | 2 +- libavcodec/vvc/vvc_filter.h | 2 +- libavcodec/vvc/vvc_intra_utils.c | 2 +- libavcodec/vvc/vvc_ps.c | 2 +- libavcodec/vvc/vvc_refs.h | 2 +- libavcodec/vvc/vvc_thread.h | 2 +- libavcodec/vvc/vvcdsp_template.c | 2 +- libavcodec/{vvc => }/vvcdec.c | 8 ++++---- libavcodec/{vvc => }/vvcdec.h | 10 +++++----- libavcodec/x86/vvc/vvcdsp_init.c | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename libavcodec/{vvc => }/vvcdec.c (99%) rename libavcodec/{vvc => }/vvcdec.h (98%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index eef936944d..1b79472f10 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -794,6 +794,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o OBJS-$(CONFIG_VP9_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o OBJS-$(CONFIG_VQC_DECODER) += vqcdec.o +OBJS-$(CONFIG_VVC_DECODER) += vvcdec.o OBJS-$(CONFIG_WADY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_WAVARC_DECODER) += wavarc.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile index 2a0055d494..9c72f2d543 100644 --- a/libavcodec/vvc/Makefile +++ b/libavcodec/vvc/Makefile @@ -1,8 +1,7 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/vvc/%) -OBJS-$(CONFIG_VVC_DECODER) += vvc/vvcdec.o \ - vvc/vvcdsp.o \ +OBJS-$(CONFIG_VVC_DECODER) += vvc/vvcdsp.o \ vvc/vvc_cabac.o \ vvc/vvc_ctu.o \ vvc/vvc_data.o \ diff --git a/libavcodec/vvc/vvc_ctu.h b/libavcodec/vvc/vvc_ctu.h index 460dbdba59..82ee033a70 100644 --- a/libavcodec/vvc/vvc_ctu.h +++ b/libavcodec/vvc/vvc_ctu.h @@ -26,7 +26,7 @@ #include "libavcodec/cabac.h" #include "libavutil/mem_internal.h" -#include "vvcdec.h" +#include "libavcodec/vvcdec.h" #define MAX_CTU_SIZE 128 diff --git a/libavcodec/vvc/vvc_filter.h b/libavcodec/vvc/vvc_filter.h index 9597437d83..0df5e1250d 100644 --- a/libavcodec/vvc/vvc_filter.h +++ b/libavcodec/vvc/vvc_filter.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_FILTER_H #define AVCODEC_VVC_VVC_FILTER_H -#include "vvcdec.h" +#include "libavcodec/vvcdec.h" /** * lmcs filter for the CTU diff --git a/libavcodec/vvc/vvc_intra_utils.c b/libavcodec/vvc/vvc_intra_utils.c index 7d34cff023..0cc21f99bb 100644 --- a/libavcodec/vvc/vvc_intra_utils.c +++ b/libavcodec/vvc/vvc_intra_utils.c @@ -25,10 +25,10 @@ #include "libavutil/avassert.h" #include "libavutil/macros.h" #include "libavutil/common.h" +#include "libavcodec/vvcdec.h" #include "vvc_ctu.h" #include "vvc_intra.h" #include "vvc_ps.h" -#include "vvcdec.h" int ff_vvc_get_mip_size_id(const int w, const int h) { diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c index 301fa16400..8560c72c2e 100644 --- a/libavcodec/vvc/vvc_ps.c +++ b/libavcodec/vvc/vvc_ps.c @@ -25,9 +25,9 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavcodec/refstruct.h" +#include "libavcodec/vvcdec.h" #include "vvc_data.h" #include "vvc_ps.h" -#include "vvcdec.h" static int sps_map_pixel_format(VVCSPS *sps, void *log_ctx) { diff --git a/libavcodec/vvc/vvc_refs.h b/libavcodec/vvc/vvc_refs.h index eba4422fb4..6d2c6d9107 100644 --- a/libavcodec/vvc/vvc_refs.h +++ b/libavcodec/vvc/vvc_refs.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_REFS_H #define AVCODEC_VVC_VVC_REFS_H -#include "vvcdec.h" +#include "libavcodec/vvcdec.h" int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, struct AVFrame *out, int no_output_of_prior_pics_flag, int flush); void ff_vvc_bump_frame(VVCContext *s, VVCFrameContext *fc); diff --git a/libavcodec/vvc/vvc_thread.h b/libavcodec/vvc/vvc_thread.h index 6c726744f8..29c56b9aa0 100644 --- a/libavcodec/vvc/vvc_thread.h +++ b/libavcodec/vvc/vvc_thread.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_VVC_VVC_THREAD_H #define AVCODEC_VVC_VVC_THREAD_H -#include "vvcdec.h" +#include "libavcodec/vvcdec.h" struct AVExecutor* ff_vvc_executor_alloc(VVCContext *s, int thread_count); void ff_vvc_executor_free(struct AVExecutor **e); diff --git a/libavcodec/vvc/vvcdsp_template.c b/libavcodec/vvc/vvcdsp_template.c index 33815d6765..ac0107740d 100644 --- a/libavcodec/vvc/vvcdsp_template.c +++ b/libavcodec/vvc/vvcdsp_template.c @@ -21,8 +21,8 @@ */ #include "libavutil/frame.h" #include "libavcodec/bit_depth_template.c" +#include "libavcodec/vvcdec.h" -#include "vvcdec.h" #include "vvc_data.h" #include "vvc_inter_template.c" diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvcdec.c similarity index 99% rename from libavcodec/vvc/vvcdec.c rename to libavcodec/vvcdec.c index d7a89f7488..1c004ef763 100644 --- a/libavcodec/vvc/vvcdec.c +++ b/libavcodec/vvcdec.c @@ -29,10 +29,10 @@ #include "libavutil/thread.h" #include "vvcdec.h" -#include "vvc_ctu.h" -#include "vvc_data.h" -#include "vvc_refs.h" -#include "vvc_thread.h" +#include "vvc/vvc_ctu.h" +#include "vvc/vvc_data.h" +#include "vvc/vvc_refs.h" +#include "vvc/vvc_thread.h" #define TAB_MAX 32 diff --git a/libavcodec/vvc/vvcdec.h b/libavcodec/vvcdec.h similarity index 98% rename from libavcodec/vvc/vvcdec.h rename to libavcodec/vvcdec.h index aa3d715524..41b0522771 100644 --- a/libavcodec/vvc/vvcdec.h +++ b/libavcodec/vvcdec.h @@ -21,14 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VVC_VVCDEC_H -#define AVCODEC_VVC_VVCDEC_H +#ifndef AVCODEC_VVCDEC_H +#define AVCODEC_VVCDEC_H #include "libavcodec/videodsp.h" #include "libavcodec/vvc.h" -#include "vvc_ps.h" -#include "vvcdsp.h" +#include "vvc/vvc_ps.h" +#include "vvc/vvcdsp.h" #define LUMA 0 #define CHROMA 1 @@ -226,4 +226,4 @@ typedef struct VVCContext { int nb_delayed; ///< delayed frames } VVCContext ; -#endif /* AVCODEC_VVC_VVCDEC_H */ +#endif /* AVCODEC_VVCDEC_H */ diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/vvcdsp_init.c index 0d2c683f0f..c57f0939ca 100644 --- a/libavcodec/x86/vvc/vvcdsp_init.c +++ b/libavcodec/x86/vvc/vvcdsp_init.c @@ -26,7 +26,7 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/vvc/vvcdec.h" +#include "libavcodec/vvcdec.h" #include "libavcodec/vvc/vvc_ctu.h" #include "libavcodec/vvc/vvcdsp.h" #include "libavcodec/x86/h26x/h2656dsp.h"