From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 13/13] avcodec/dca_lbr: Inline nb_bits for VLCs
Date: Tue, 13 Sep 2022 13:33:10 +0200
Message-ID: <GV1P250MB073782B22FA4C45ECD5B494D8F479@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB0737F59A25C260BC89CFE14F8F479@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/dca_lbr.c | 31 ++++++++++++++++---------------
libavcodec/dcahuff.c | 24 ++++++++++++------------
libavcodec/dcahuff.h | 11 +++++++++++
3 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c
index 9a0eb62f06..73bc16d275 100644
--- a/libavcodec/dca_lbr.c
+++ b/libavcodec/dca_lbr.c
@@ -267,9 +267,10 @@ static int parse_lfe_chunk(DCALbrDecoder *s, LBRChunk *chunk)
return AVERROR_INVALIDDATA;
}
-static inline int parse_vlc(GetBitContext *s, VLC *vlc, int max_depth)
+static inline int parse_vlc(GetBitContext *s, const VLC *vlc,
+ int nb_bits, int max_depth)
{
- int v = get_vlc2(s, vlc->table, vlc->bits, max_depth);
+ int v = get_vlc2(s, vlc->table, nb_bits, max_depth);
if (v >= 0)
return v;
// Rare value
@@ -296,7 +297,7 @@ static int parse_tonal(DCALbrDecoder *s, int group)
return AVERROR_INVALIDDATA;
}
- diff = parse_vlc(&s->gb, &ff_dca_vlc_tnl_grp[group], 2);
+ diff = parse_vlc(&s->gb, &ff_dca_vlc_tnl_grp[group], DCA_TNL_GRP_VLC_BITS, 2);
if (diff >= FF_ARRAY_ELEMS(ff_dca_fst_amp)) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid tonal frequency diff\n");
return AVERROR_INVALIDDATA;
@@ -314,7 +315,7 @@ static int parse_tonal(DCALbrDecoder *s, int group)
// Main channel
main_ch = get_bitsz(&s->gb, ch_nbits);
- main_amp = parse_vlc(&s->gb, &ff_dca_vlc_tnl_scf, 2)
+ main_amp = parse_vlc(&s->gb, &ff_dca_vlc_tnl_scf, DCA_TNL_SCF_VLC_BITS, 2)
+ s->tonal_scf[ff_dca_freq_to_sb[freq >> (7 - group)]]
+ s->limited_range - 2;
amp[main_ch] = main_amp < AMP_MAX ? main_amp : 0;
@@ -325,8 +326,8 @@ static int parse_tonal(DCALbrDecoder *s, int group)
if (ch == main_ch)
continue;
if (get_bits1(&s->gb)) {
- amp[ch] = amp[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_damp, 1);
- phs[ch] = phs[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_dph, 1);
+ amp[ch] = amp[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_damp, DCA_DAMP_VLC_BITS, 1);
+ phs[ch] = phs[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_dph, DCA_DPH_VLC_BITS, 1);
} else {
amp[ch] = 0;
phs[ch] = 0;
@@ -430,7 +431,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf)
return 0;
// Initial scale factor
- prev = parse_vlc(&s->gb, &ff_dca_vlc_fst_rsd_amp, 2);
+ prev = parse_vlc(&s->gb, &ff_dca_vlc_fst_rsd_amp, DCA_FST_RSD_VLC_BITS, 2);
for (sf = 0; sf < 7; sf += dist) {
scf[sf] = prev; // Store previous value
@@ -439,7 +440,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf)
return 0;
// Interpolation distance
- dist = parse_vlc(&s->gb, &ff_dca_vlc_rsd_apprx, 1) + 1;
+ dist = parse_vlc(&s->gb, &ff_dca_vlc_rsd_apprx, DCA_RSD_APPRX_VLC_BITS, 1) + 1;
if (dist > 7 - sf) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid scale factor distance\n");
return AVERROR_INVALIDDATA;
@@ -449,7 +450,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf)
return 0;
// Final interpolation point
- next = parse_vlc(&s->gb, &ff_dca_vlc_rsd_amp, 2);
+ next = parse_vlc(&s->gb, &ff_dca_vlc_rsd_amp, DCA_RSD_AMP_VLC_BITS, 2);
if (next & 1)
next = prev + ((next + 1) >> 1);
@@ -493,7 +494,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf)
static int parse_st_code(GetBitContext *s, int min_v)
{
- unsigned int v = parse_vlc(s, &ff_dca_vlc_st_grid, 2) + min_v;
+ unsigned int v = parse_vlc(s, &ff_dca_vlc_st_grid, DCA_ST_GRID_VLC_BITS, 2) + min_v;
if (v & 1)
v = 16 + (v >> 1);
@@ -534,10 +535,10 @@ static int parse_grid_1_chunk(DCALbrDecoder *s, LBRChunk *chunk, int ch1, int ch
// Average values for third grid
for (sb = 0; sb < s->nsubbands - 4; sb++) {
- s->grid_3_avg[ch1][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, 2) - 16;
+ s->grid_3_avg[ch1][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 2) - 16;
if (ch1 != ch2) {
if (sb + 4 < s->min_mono_subband)
- s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, 2) - 16;
+ s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 2) - 16;
else
s->grid_3_avg[ch2][sb] = s->grid_3_avg[ch1][sb];
}
@@ -592,7 +593,7 @@ static int parse_grid_1_sec_ch(DCALbrDecoder *s, int ch2)
if (sb + 4 >= s->min_mono_subband) {
if (ensure_bits(&s->gb, 20))
return 0;
- s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, 2) - 16;
+ s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 2) - 16;
}
}
@@ -613,7 +614,7 @@ static void parse_grid_3(DCALbrDecoder *s, int ch1, int ch2, int sb, int flag)
for (i = 0; i < 8; i++) {
if (ensure_bits(&s->gb, 20))
return;
- s->grid_3_scf[ch][sb][i] = parse_vlc(&s->gb, &ff_dca_vlc_grid_3, 2) - 16;
+ s->grid_3_scf[ch][sb][i] = parse_vlc(&s->gb, &ff_dca_vlc_grid_3, DCA_GRID_VLC_BITS, 2) - 16;
}
// Flag scale factors for this subband parsed
@@ -896,7 +897,7 @@ static int parse_grid_2(DCALbrDecoder *s, int ch1, int ch2,
for (j = 0; j < 8; j++) {
if (ensure_bits(&s->gb, 20))
break;
- g2_scf[j] = parse_vlc(&s->gb, &ff_dca_vlc_grid_2, 2);
+ g2_scf[j] = parse_vlc(&s->gb, &ff_dca_vlc_grid_2, DCA_GRID_VLC_BITS, 2);
}
} else {
memset(g2_scf, 0, 8);
diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c
index 937a87ee05..af3a6e5326 100644
--- a/libavcodec/dcahuff.c
+++ b/libavcodec/dcahuff.c
@@ -831,16 +831,16 @@ av_cold void ff_dca_init_vlcs(void)
} while (0)
for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_tnl_grp); i++)
- LBR_INIT_VLC(ff_dca_vlc_tnl_grp[i], 9, tnl_grp_sizes[i], -1);
- LBR_INIT_VLC(ff_dca_vlc_tnl_scf, 9, 20, -1);
- LBR_INIT_VLC(ff_dca_vlc_damp, 6, 7, -1);
- LBR_INIT_VLC(ff_dca_vlc_dph, 6, 9, -1);
- LBR_INIT_VLC(ff_dca_vlc_fst_rsd_amp, 9, 24, -1);
- LBR_INIT_VLC(ff_dca_vlc_rsd_apprx, 5, 6, -1);
- LBR_INIT_VLC(ff_dca_vlc_rsd_amp, 9, 33, -1);
- LBR_INIT_VLC(ff_dca_vlc_avg_g3, 9, 18, -1);
- LBR_INIT_VLC(ff_dca_vlc_st_grid, 9, 22, -1);
- LBR_INIT_VLC(ff_dca_vlc_grid_2, 9, 20, -1);
- LBR_INIT_VLC(ff_dca_vlc_grid_3, 9, 13, -1);
- LBR_INIT_VLC(ff_dca_vlc_rsd, 6, 9, 0);
+ LBR_INIT_VLC(ff_dca_vlc_tnl_grp[i], DCA_TNL_GRP_VLC_BITS, tnl_grp_sizes[i], -1);
+ LBR_INIT_VLC(ff_dca_vlc_tnl_scf, DCA_TNL_SCF_VLC_BITS, 20, -1);
+ LBR_INIT_VLC(ff_dca_vlc_damp, DCA_DAMP_VLC_BITS, 7, -1);
+ LBR_INIT_VLC(ff_dca_vlc_dph, DCA_DPH_VLC_BITS, 9, -1);
+ LBR_INIT_VLC(ff_dca_vlc_fst_rsd_amp, DCA_FST_RSD_VLC_BITS, 24, -1);
+ LBR_INIT_VLC(ff_dca_vlc_rsd_apprx, DCA_RSD_APPRX_VLC_BITS, 6, -1);
+ LBR_INIT_VLC(ff_dca_vlc_rsd_amp, DCA_RSD_AMP_VLC_BITS, 33, -1);
+ LBR_INIT_VLC(ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 18, -1);
+ LBR_INIT_VLC(ff_dca_vlc_st_grid, DCA_ST_GRID_VLC_BITS, 22, -1);
+ LBR_INIT_VLC(ff_dca_vlc_grid_2, DCA_GRID_VLC_BITS, 20, -1);
+ LBR_INIT_VLC(ff_dca_vlc_grid_3, DCA_GRID_VLC_BITS, 13, -1);
+ LBR_INIT_VLC(ff_dca_vlc_rsd, DCA_RSD_VLC_BITS, 9, 0);
}
diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index eaae234479..fdfe7e922a 100644
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@@ -42,17 +42,28 @@ extern VLC ff_dca_vlc_transition_mode[4];
extern VLC ff_dca_vlc_scale_factor[5];
extern VLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS][7];
+#define DCA_TNL_GRP_VLC_BITS 9
extern VLC ff_dca_vlc_tnl_grp[5];
+#define DCA_TNL_SCF_VLC_BITS 9
extern VLC ff_dca_vlc_tnl_scf;
+#define DCA_DAMP_VLC_BITS 6
extern VLC ff_dca_vlc_damp;
+#define DCA_DPH_VLC_BITS 6
extern VLC ff_dca_vlc_dph;
+#define DCA_FST_RSD_VLC_BITS 9
extern VLC ff_dca_vlc_fst_rsd_amp;
+#define DCA_RSD_APPRX_VLC_BITS 5
extern VLC ff_dca_vlc_rsd_apprx;
+#define DCA_RSD_AMP_VLC_BITS 9
extern VLC ff_dca_vlc_rsd_amp;
+#define DCA_AVG_G3_VLC_BITS 9
extern VLC ff_dca_vlc_avg_g3;
+#define DCA_ST_GRID_VLC_BITS 9
extern VLC ff_dca_vlc_st_grid;
+#define DCA_GRID_VLC_BITS 9
extern VLC ff_dca_vlc_grid_2;
extern VLC ff_dca_vlc_grid_3;
+#define DCA_RSD_VLC_BITS 6
extern VLC ff_dca_vlc_rsd;
extern const int8_t ff_dca_bitalloc_offsets[DCA_CODE_BOOKS];
--
2.34.1
_______________________________________________
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".
next prev parent reply other threads:[~2022-09-13 11:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 11:28 [FFmpeg-devel] [PATCH 01/13] avcodec/dolby_e_parser: Remove unnecessary headers Andreas Rheinhardt
2022-09-13 11:32 ` [FFmpeg-devel] [PATCH 02/13] avcodec/dcahuff: Remove unused define Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 03/13] avcodec/dcahuff: Avoid redundant offset table Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 04/13] avcodec/dca_core, dcahuff: Don't use DCAVLC unnecessarily Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 05/13] avcodec/dcahuff: Always use three bits for transition mode VLCs Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 06/13] avcodec/dcaenc: Create encoder-adapted tables Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 07/13] avcodec/dcahuff: Combine tables, use ff_init_vlc_from_lengths() Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 08/13] avcodec/dcahuff, dca_core, dca_lbr: Apply offset during VLC creation Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 09/13] avcodec/dca_core: Inline number of bits of scale factor VLCs Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 10/13] avcodec/dca_core: Don't use too big max_depth in get_vlc2() Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 11/13] avcodec/dcahuff: Replace DCAVLC by ordinary VLCs Andreas Rheinhardt
2022-09-13 11:33 ` [FFmpeg-devel] [PATCH 12/13] avcodec/dca_lbr: Hardcode lpc table to save space Andreas Rheinhardt
2022-09-13 11:33 ` Andreas Rheinhardt [this message]
2022-09-15 19:34 ` [FFmpeg-devel] [PATCH 01/13] avcodec/dolby_e_parser: Remove unnecessary headers Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=GV1P250MB073782B22FA4C45ECD5B494D8F479@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git