History

avcodec/svq1dec: Avoid superfluous VLC structures

Of all these VLCs here, only VLC.table was really used after init, so use the ff_vlc_init_tables API to get rid of them.

Andreas Rheinhardt committed 3 years ago

Commit 7d542e21 parent 7902c0d1 file · +38 −44Browse files

Unified · Split

libavcodec/svq1dec.c+38−44
@@ -45,12 +45,12 @@ · 44 unmodified lines
45#include "svq1.h"45#include "svq1.h"
46 46
47#define SVQ1_BLOCK_TYPE_VLC_BITS 347#define SVQ1_BLOCK_TYPE_VLC_BITS 3
48static VLC svq1_block_type;48static VLCElem svq1_block_type[8];
49static VLC svq1_motion_component;49static VLCElem svq1_motion_component[176];
50static VLC svq1_intra_multistage[6];50static const VLCElem *svq1_intra_multistage[6];
51static VLC svq1_inter_multistage[6];51static const VLCElem *svq1_inter_multistage[6];
52static VLC svq1_intra_mean;52static VLCElem svq1_intra_mean[632];
53static VLC svq1_inter_mean;53static VLCElem svq1_inter_mean[1434];
54 54
55/* motion vector (prediction) */55/* motion vector (prediction) */
56typedef struct svq1_pmv_s {56typedef struct svq1_pmv_s {
@@ -190,7 +190,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, · 133 unmodified lines
190 height = 1 << ((3 + level) / 2);190 height = 1 << ((3 + level) / 2);
191 191
192 /* get number of stages (-1 skips vector, 0 for mean only) */192 /* get number of stages (-1 skips vector, 0 for mean only) */
193 stages = get_vlc2(bitbuf, svq1_intra_multistage[level].table, 3, 3) - 1;193 stages = get_vlc2(bitbuf, svq1_intra_multistage[level], 3, 3) - 1;
194 194
195 if (stages == -1) {195 if (stages == -1) {
196 for (y = 0; y < height; y++)196 for (y = 0; y < height; y++)
@@ -206,7 +206,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, · 9 unmodified lines
206 }206 }
207 av_assert0(stages >= 0);207 av_assert0(stages >= 0);
208 208
209 mean = get_vlc2(bitbuf, svq1_intra_mean.table, 8, 3);209 mean = get_vlc2(bitbuf, svq1_intra_mean, 8, 3);
210 210
211 if (stages == 0) {211 if (stages == 0) {
212 for (y = 0; y < height; y++)212 for (y = 0; y < height; y++)
@@ -257,7 +257,7 @@ static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, · 44 unmodified lines
257 height = 1 << ((3 + level) / 2);257 height = 1 << ((3 + level) / 2);
258 258
259 /* get number of stages (-1 skips vector, 0 for mean only) */259 /* get number of stages (-1 skips vector, 0 for mean only) */
260 stages = get_vlc2(bitbuf, svq1_inter_multistage[level].table, 3, 2) - 1;260 stages = get_vlc2(bitbuf, svq1_inter_multistage[level], 3, 2) - 1;
261 261
262 if (stages == -1)262 if (stages == -1)
263 continue; /* skip vector */263 continue; /* skip vector */
@@ -270,7 +270,7 @@ static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, · 6 unmodified lines
270 }270 }
271 av_assert0(stages >= 0);271 av_assert0(stages >= 0);
272 272
273 mean = get_vlc2(bitbuf, svq1_inter_mean.table, 9, 3) - 256;273 mean = get_vlc2(bitbuf, svq1_inter_mean, 9, 3) - 256;
274 274
275 if (buggy) {275 if (buggy) {
276 if (mean == -128)276 if (mean == -128)
@@ -307,7 +307,7 @@ static int svq1_decode_motion_vector(GetBitContext *bitbuf, svq1_pmv *mv, · 30 unmodified lines
307 307
308 for (i = 0; i < 2; i++) {308 for (i = 0; i < 2; i++) {
309 /* get motion code */309 /* get motion code */
310 diff = get_vlc2(bitbuf, svq1_motion_component.table, 7, 2);310 diff = get_vlc2(bitbuf, svq1_motion_component, 7, 2);
311 if (diff < 0)311 if (diff < 0)
312 return AVERROR_INVALIDDATA;312 return AVERROR_INVALIDDATA;
313 else if (diff) {313 else if (diff) {
@@ -472,7 +472,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, · 158 unmodified lines
472 int result = 0;472 int result = 0;
473 473
474 /* get block type */474 /* get block type */
475 block_type = get_vlc2(bitbuf, svq1_block_type.table,475 block_type = get_vlc2(bitbuf, svq1_block_type,
476 SVQ1_BLOCK_TYPE_VLC_BITS, 1);476 SVQ1_BLOCK_TYPE_VLC_BITS, 1);
477 477
478 /* reset motion vectors */478 /* reset motion vectors */
@@ -779,41 +779,35 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur, · 300 unmodified lines
779 779
780static av_cold void svq1_static_init(void)780static av_cold void svq1_static_init(void)
781{781{
782 VLC_INIT_STATIC(&svq1_block_type, SVQ1_BLOCK_TYPE_VLC_BITS, 4,782 static VLCElem table[168];
783 &ff_svq1_block_type_vlc[0][1], 2, 1,783 VLCInitState state = VLC_INIT_STATE(table);
784 &ff_svq1_block_type_vlc[0][0], 2, 1, 8);784
785 785 VLC_INIT_STATIC_TABLE(svq1_block_type, SVQ1_BLOCK_TYPE_VLC_BITS, 4,
786 VLC_INIT_STATIC(&svq1_motion_component, 7, 33,786 &ff_svq1_block_type_vlc[0][1], 2, 1,
787 &ff_mvtab[0][1], 2, 1,787 &ff_svq1_block_type_vlc[0][0], 2, 1, 0);
788 &ff_mvtab[0][0], 2, 1, 176);788
789 789 VLC_INIT_STATIC_TABLE(svq1_motion_component, 7, 33,
790 for (int i = 0, offset = 0; i < 6; i++) {790 &ff_mvtab[0][1], 2, 1,
791 static const uint8_t sizes[2][6] = { { 14, 10, 14, 18, 16, 18 },791 &ff_mvtab[0][0], 2, 1, 0);
792 { 10, 10, 14, 14, 14, 16 } };792
793 static VLCElem table[168];793 for (int i = 0; i < 6; i++) {
794 svq1_intra_multistage[i].table = &table[offset];794 svq1_intra_multistage[i] =
795 svq1_intra_multistage[i].table_allocated = sizes[0][i];795 ff_vlc_init_tables(&state, 3, 8,
796 offset += sizes[0][i];796 &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1,
797 vlc_init(&svq1_intra_multistage[i], 3, 8,797 &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, 0);
798 &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1,798 svq1_inter_multistage[i] =
799 &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1,799 ff_vlc_init_tables(&state, 3, 8,
800 VLC_INIT_USE_STATIC);800 &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1,
801 svq1_inter_multistage[i].table = &table[offset];801 &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, 0);
802 svq1_inter_multistage[i].table_allocated = sizes[1][i];
803 offset += sizes[1][i];
804 vlc_init(&svq1_inter_multistage[i], 3, 8,
805 &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1,
806 &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1,
807 VLC_INIT_USE_STATIC);
808 }802 }
809 803
810 VLC_INIT_STATIC(&svq1_intra_mean, 8, 256,804 VLC_INIT_STATIC_TABLE(svq1_intra_mean, 8, 256,
811 &ff_svq1_intra_mean_vlc[0][1], 4, 2,805 &ff_svq1_intra_mean_vlc[0][1], 4, 2,
812 &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632);806 &ff_svq1_intra_mean_vlc[0][0], 4, 2, 0);
813 807
814 VLC_INIT_STATIC(&svq1_inter_mean, 9, 512,808 VLC_INIT_STATIC_TABLE(svq1_inter_mean, 9, 512,
815 &ff_svq1_inter_mean_vlc[0][1], 4, 2,809 &ff_svq1_inter_mean_vlc[0][1], 4, 2,
816 &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1434);810 &ff_svq1_inter_mean_vlc[0][0], 4, 2, 0);
817}811}
818 812
819static av_cold int svq1_decode_init(AVCodecContext *avctx)813static av_cold int svq1_decode_init(AVCodecContext *avctx)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t