[FFmpeg-cvslog] avcodec/mpeg12enc: Reindentation
Andreas Rheinhardt
git at videolan.org
Wed Nov 25 02:31:01 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Nov 24 14:43:46 2020 +0100| [3de3d2f5e24985bfd53b9b85122079a98816e259] | committer: Andreas Rheinhardt
avcodec/mpeg12enc: Reindentation
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3de3d2f5e24985bfd53b9b85122079a98816e259
---
libavcodec/mpeg12enc.c | 114 ++++++++++++++++++++++++-------------------------
1 file changed, 55 insertions(+), 59 deletions(-)
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index b069f2db64..2466db8a91 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -1037,74 +1037,70 @@ void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64],
static av_cold void mpeg12_encode_init_static(void)
{
- int f_code;
- int mv;
- int i;
+ ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
+ ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
- ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
- ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
+ for (int i = 0; i < 64; i++) {
+ mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i];
+ mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i];
+ }
- for (i = 0; i < 64; i++) {
- mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i];
- mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i];
- }
+ init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len);
+ init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len);
- init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len);
- init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len);
-
- /* build unified dc encoding tables */
- for (i = -255; i < 256; i++) {
- int adiff, index;
- int bits, code;
- int diff = i;
-
- adiff = FFABS(diff);
- if (diff < 0)
- diff--;
- index = av_log2(2 * adiff);
-
- bits = ff_mpeg12_vlc_dc_lum_bits[index] + index;
- code = (ff_mpeg12_vlc_dc_lum_code[index] << index) +
- av_mod_uintp2(diff, index);
- mpeg1_lum_dc_uni[i + 255] = bits + (code << 8);
-
- bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index;
- code = (ff_mpeg12_vlc_dc_chroma_code[index] << index) +
- av_mod_uintp2(diff, index);
- mpeg1_chr_dc_uni[i + 255] = bits + (code << 8);
- }
+ /* build unified dc encoding tables */
+ for (int i = -255; i < 256; i++) {
+ int adiff, index;
+ int bits, code;
+ int diff = i;
- for (f_code = 1; f_code <= MAX_FCODE; f_code++)
- for (mv = -MAX_DMV; mv <= MAX_DMV; mv++) {
- int len;
+ adiff = FFABS(diff);
+ if (diff < 0)
+ diff--;
+ index = av_log2(2 * adiff);
- if (mv == 0) {
- len = ff_mpeg12_mbMotionVectorTable[0][1];
- } else {
- int val, bit_size, code;
-
- bit_size = f_code - 1;
-
- val = mv;
- if (val < 0)
- val = -val;
- val--;
- code = (val >> bit_size) + 1;
- if (code < 17)
- len = ff_mpeg12_mbMotionVectorTable[code][1] +
- 1 + bit_size;
- else
- len = ff_mpeg12_mbMotionVectorTable[16][1] +
- 2 + bit_size;
- }
+ bits = ff_mpeg12_vlc_dc_lum_bits[index] + index;
+ code = (ff_mpeg12_vlc_dc_lum_code[index] << index) +
+ av_mod_uintp2(diff, index);
+ mpeg1_lum_dc_uni[i + 255] = bits + (code << 8);
- mv_penalty[f_code][mv + MAX_DMV] = len;
+ bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index;
+ code = (ff_mpeg12_vlc_dc_chroma_code[index] << index) +
+ av_mod_uintp2(diff, index);
+ mpeg1_chr_dc_uni[i + 255] = bits + (code << 8);
+ }
+
+ for (int f_code = 1; f_code <= MAX_FCODE; f_code++)
+ for (int mv = -MAX_DMV; mv <= MAX_DMV; mv++) {
+ int len;
+
+ if (mv == 0) {
+ len = ff_mpeg12_mbMotionVectorTable[0][1];
+ } else {
+ int val, bit_size, code;
+
+ bit_size = f_code - 1;
+
+ val = mv;
+ if (val < 0)
+ val = -val;
+ val--;
+ code = (val >> bit_size) + 1;
+ if (code < 17)
+ len = ff_mpeg12_mbMotionVectorTable[code][1] +
+ 1 + bit_size;
+ else
+ len = ff_mpeg12_mbMotionVectorTable[16][1] +
+ 2 + bit_size;
}
+ mv_penalty[f_code][mv + MAX_DMV] = len;
+ }
+
- for (f_code = MAX_FCODE; f_code > 0; f_code--)
- for (mv = -(8 << f_code); mv < (8 << f_code); mv++)
- fcode_tab[mv + MAX_MV] = f_code;
+ for (int f_code = MAX_FCODE; f_code > 0; f_code--)
+ for (int mv = -(8 << f_code); mv < (8 << f_code); mv++)
+ fcode_tab[mv + MAX_MV] = f_code;
}
av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
More information about the ffmpeg-cvslog
mailing list