Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -800,12 +800,6 @@ void ff_vvc_ps_uninit(VVCParamSets *ps) · 799 unmodified lines | |||
| 800 | ff_refstruct_unref(&ps->pps_list[i]); | 800 | ff_refstruct_unref(&ps->pps_list[i]); |
| 801 | } | 801 | } |
| 802 | 802 | ||
| 803 | enum { | ||
| 804 | APS_ALF, | ||
| 805 | APS_LMCS, | ||
| 806 | APS_SCALING, | ||
| 807 | }; | ||
| 808 | |||
| 809 | static void alf_coeff(int16_t *coeff, | 803 | static void alf_coeff(int16_t *coeff, |
| 810 | const uint8_t *abs, const uint8_t *sign, const int size) | 804 | const uint8_t *abs, const uint8_t *sign, const int size) |
| 811 | { | 805 | { |
| @@ -990,13 +984,13 @@ int ff_vvc_decode_aps(VVCParamSets *ps, const CodedBitstreamUnit *unit) · 178 unmodified lines | |||
| 990 | return AVERROR_INVALIDDATA; | 984 | return AVERROR_INVALIDDATA; |
| 991 | 985 | ||
| 992 | switch (aps->aps_params_type) { | 986 | switch (aps->aps_params_type) { |
| 993 | case APS_ALF: | 987 | case VVC_ASP_TYPE_ALF: |
| 994 | ret = aps_decode_alf(&ps->alf_list[aps->aps_adaptation_parameter_set_id], aps); | 988 | ret = aps_decode_alf(&ps->alf_list[aps->aps_adaptation_parameter_set_id], aps); |
| 995 | break; | 989 | break; |
| 996 | case APS_LMCS: | 990 | case VVC_ASP_TYPE_LMCS: |
| 997 | ff_refstruct_replace(&ps->lmcs_list[aps->aps_adaptation_parameter_set_id], aps); | 991 | ff_refstruct_replace(&ps->lmcs_list[aps->aps_adaptation_parameter_set_id], aps); |
| 998 | break; | 992 | break; |
| 999 | case APS_SCALING: | 993 | case VVC_ASP_TYPE_SCALING: |
| 1000 | ret = aps_decode_scaling(&ps->scaling_list[aps->aps_adaptation_parameter_set_id], aps); | 994 | ret = aps_decode_scaling(&ps->scaling_list[aps->aps_adaptation_parameter_set_id], aps); |
| 1001 | break; | 995 | break; |
| 1002 | } | 996 | } |