[FFmpeg-cvslog] avcodec/vvc_ps: remove duplicated enum

James Almer git at videolan.org
Sat Jan 27 00:21:37 EET 2024


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Jan 26 19:20:48 2024 -0300| [eb4584f994fb9bcfe2a305dada99f8dd5805aae0] | committer: James Almer

avcodec/vvc_ps: remove duplicated enum

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb4584f994fb9bcfe2a305dada99f8dd5805aae0
---

 libavcodec/vvc/vvc_ps.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c
index c2afc0ac93..2cf156b323 100644
--- a/libavcodec/vvc/vvc_ps.c
+++ b/libavcodec/vvc/vvc_ps.c
@@ -800,12 +800,6 @@ void ff_vvc_ps_uninit(VVCParamSets *ps)
         ff_refstruct_unref(&ps->pps_list[i]);
 }
 
-enum {
-    APS_ALF,
-    APS_LMCS,
-    APS_SCALING,
-};
-
 static void alf_coeff(int16_t *coeff,
     const uint8_t *abs, const uint8_t *sign, const int size)
 {
@@ -990,13 +984,13 @@ int ff_vvc_decode_aps(VVCParamSets *ps, const CodedBitstreamUnit *unit)
         return AVERROR_INVALIDDATA;
 
     switch (aps->aps_params_type) {
-        case APS_ALF:
+        case VVC_ASP_TYPE_ALF:
             ret = aps_decode_alf(&ps->alf_list[aps->aps_adaptation_parameter_set_id], aps);
             break;
-        case APS_LMCS:
+        case VVC_ASP_TYPE_LMCS:
             ff_refstruct_replace(&ps->lmcs_list[aps->aps_adaptation_parameter_set_id], aps);
             break;
-        case APS_SCALING:
+        case VVC_ASP_TYPE_SCALING:
             ret = aps_decode_scaling(&ps->scaling_list[aps->aps_adaptation_parameter_set_id], aps);
             break;
     }



More information about the ffmpeg-cvslog mailing list