History

avcodec/me_cmp: remove ff_me_cmp_init_static()

Precalculate and constify ff_square_tab.

Muhammad Faiz committed 8 years ago

Commit caa4bd71 parent 118e1b06 files · +42 −31Browse files

Unified · Split

6 files
  1. libavcodec/me_cmp.c +38 −12
  2. libavcodec/me_cmp.h +1 −3
  3. libavcodec/mpegvideo_enc.c +1 −1
  4. libavcodec/mpegvideoencdsp.c +1 −1
  5. libavcodec/snowenc.c +1 −1
  6. libavcodec/utils.c +0 −13
libavcodec/me_cmp.c+38−12
@@ -29,13 +29,47 @@ · 28 unmodified lines
29#include "mpegvideo.h"29#include "mpegvideo.h"
30#include "config.h"30#include "config.h"
31 31
32uint32_t ff_square_tab[512] = { 0, };32/* (i - 256) * (i - 256) */
33const uint32_t ff_square_tab[512] = {
34 65536, 65025, 64516, 64009, 63504, 63001, 62500, 62001, 61504, 61009, 60516, 60025, 59536, 59049, 58564, 58081,
35 57600, 57121, 56644, 56169, 55696, 55225, 54756, 54289, 53824, 53361, 52900, 52441, 51984, 51529, 51076, 50625,
36 50176, 49729, 49284, 48841, 48400, 47961, 47524, 47089, 46656, 46225, 45796, 45369, 44944, 44521, 44100, 43681,
37 43264, 42849, 42436, 42025, 41616, 41209, 40804, 40401, 40000, 39601, 39204, 38809, 38416, 38025, 37636, 37249,
38 36864, 36481, 36100, 35721, 35344, 34969, 34596, 34225, 33856, 33489, 33124, 32761, 32400, 32041, 31684, 31329,
39 30976, 30625, 30276, 29929, 29584, 29241, 28900, 28561, 28224, 27889, 27556, 27225, 26896, 26569, 26244, 25921,
40 25600, 25281, 24964, 24649, 24336, 24025, 23716, 23409, 23104, 22801, 22500, 22201, 21904, 21609, 21316, 21025,
41 20736, 20449, 20164, 19881, 19600, 19321, 19044, 18769, 18496, 18225, 17956, 17689, 17424, 17161, 16900, 16641,
42 16384, 16129, 15876, 15625, 15376, 15129, 14884, 14641, 14400, 14161, 13924, 13689, 13456, 13225, 12996, 12769,
43 12544, 12321, 12100, 11881, 11664, 11449, 11236, 11025, 10816, 10609, 10404, 10201, 10000, 9801, 9604, 9409,
44 9216, 9025, 8836, 8649, 8464, 8281, 8100, 7921, 7744, 7569, 7396, 7225, 7056, 6889, 6724, 6561,
45 6400, 6241, 6084, 5929, 5776, 5625, 5476, 5329, 5184, 5041, 4900, 4761, 4624, 4489, 4356, 4225,
46 4096, 3969, 3844, 3721, 3600, 3481, 3364, 3249, 3136, 3025, 2916, 2809, 2704, 2601, 2500, 2401,
47 2304, 2209, 2116, 2025, 1936, 1849, 1764, 1681, 1600, 1521, 1444, 1369, 1296, 1225, 1156, 1089,
48 1024, 961, 900, 841, 784, 729, 676, 625, 576, 529, 484, 441, 400, 361, 324, 289,
49 256, 225, 196, 169, 144, 121, 100, 81, 64, 49, 36, 25, 16, 9, 4, 1,
50 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
51 256, 289, 324, 361, 400, 441, 484, 529, 576, 625, 676, 729, 784, 841, 900, 961,
52 1024, 1089, 1156, 1225, 1296, 1369, 1444, 1521, 1600, 1681, 1764, 1849, 1936, 2025, 2116, 2209,
53 2304, 2401, 2500, 2601, 2704, 2809, 2916, 3025, 3136, 3249, 3364, 3481, 3600, 3721, 3844, 3969,
54 4096, 4225, 4356, 4489, 4624, 4761, 4900, 5041, 5184, 5329, 5476, 5625, 5776, 5929, 6084, 6241,
55 6400, 6561, 6724, 6889, 7056, 7225, 7396, 7569, 7744, 7921, 8100, 8281, 8464, 8649, 8836, 9025,
56 9216, 9409, 9604, 9801, 10000, 10201, 10404, 10609, 10816, 11025, 11236, 11449, 11664, 11881, 12100, 12321,
57 12544, 12769, 12996, 13225, 13456, 13689, 13924, 14161, 14400, 14641, 14884, 15129, 15376, 15625, 15876, 16129,
58 16384, 16641, 16900, 17161, 17424, 17689, 17956, 18225, 18496, 18769, 19044, 19321, 19600, 19881, 20164, 20449,
59 20736, 21025, 21316, 21609, 21904, 22201, 22500, 22801, 23104, 23409, 23716, 24025, 24336, 24649, 24964, 25281,
60 25600, 25921, 26244, 26569, 26896, 27225, 27556, 27889, 28224, 28561, 28900, 29241, 29584, 29929, 30276, 30625,
61 30976, 31329, 31684, 32041, 32400, 32761, 33124, 33489, 33856, 34225, 34596, 34969, 35344, 35721, 36100, 36481,
62 36864, 37249, 37636, 38025, 38416, 38809, 39204, 39601, 40000, 40401, 40804, 41209, 41616, 42025, 42436, 42849,
63 43264, 43681, 44100, 44521, 44944, 45369, 45796, 46225, 46656, 47089, 47524, 47961, 48400, 48841, 49284, 49729,
64 50176, 50625, 51076, 51529, 51984, 52441, 52900, 53361, 53824, 54289, 54756, 55225, 55696, 56169, 56644, 57121,
65 57600, 58081, 58564, 59049, 59536, 60025, 60516, 61009, 61504, 62001, 62500, 63001, 63504, 64009, 64516, 65025,
66};
33 67
34static int sse4_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,68static int sse4_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
35 ptrdiff_t stride, int h)69 ptrdiff_t stride, int h)
36{70{
37 int s = 0, i;71 int s = 0, i;
38 uint32_t *sq = ff_square_tab + 256;72 const uint32_t *sq = ff_square_tab + 256;
39 73
40 for (i = 0; i < h; i++) {74 for (i = 0; i < h; i++) {
41 s += sq[pix1[0] - pix2[0]];75 s += sq[pix1[0] - pix2[0]];
@@ -52,7 +86,7 @@ static int sse8_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, · 10 unmodified lines
52 ptrdiff_t stride, int h)86 ptrdiff_t stride, int h)
53{87{
54 int s = 0, i;88 int s = 0, i;
55 uint32_t *sq = ff_square_tab + 256;89 const uint32_t *sq = ff_square_tab + 256;
56 90
57 for (i = 0; i < h; i++) {91 for (i = 0; i < h; i++) {
58 s += sq[pix1[0] - pix2[0]];92 s += sq[pix1[0] - pix2[0]];
@@ -73,7 +107,7 @@ static int sse16_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, · 14 unmodified lines
73 ptrdiff_t stride, int h)107 ptrdiff_t stride, int h)
74{108{
75 int s = 0, i;109 int s = 0, i;
76 uint32_t *sq = ff_square_tab + 256;110 const uint32_t *sq = ff_square_tab + 256;
77 111
78 for (i = 0; i < h; i++) {112 for (i = 0; i < h; i++) {
79 s += sq[pix1[0] - pix2[0]];113 s += sq[pix1[0] - pix2[0]];
@@ -977,14 +1011,6 @@ WRAPPER8_16_SQ(quant_psnr8x8_c, quant_psnr16_c) · 897 unmodified lines
977WRAPPER8_16_SQ(rd8x8_c, rd16_c)1011WRAPPER8_16_SQ(rd8x8_c, rd16_c)
978WRAPPER8_16_SQ(bit8x8_c, bit16_c)1012WRAPPER8_16_SQ(bit8x8_c, bit16_c)
979 1013
980av_cold void ff_me_cmp_init_static(void)
981{
982 int i;
983
984 for (i = 0; i < 512; i++)
985 ff_square_tab[i] = (i - 256) * (i - 256);
986}
987
988int ff_check_alignment(void)1014int ff_check_alignment(void)
989{1015{
990 static int did_fail = 0;1016 static int did_fail = 0;
libavcodec/me_cmp.h+1−3
@@ -23,7 +23,7 @@ · 22 unmodified lines
23 23
24#include "avcodec.h"24#include "avcodec.h"
25 25
26extern uint32_t ff_square_tab[512];26extern const uint32_t ff_square_tab[512];
27 27
28 28
29/* minimum alignment rules ;)29/* minimum alignment rules ;)
@@ -79,8 +79,6 @@ typedef struct MECmpContext { · 49 unmodified lines
79 me_cmp_func median_sad[6];79 me_cmp_func median_sad[6];
80} MECmpContext;80} MECmpContext;
81 81
82void ff_me_cmp_init_static(void);
83
84int ff_check_alignment(void);82int ff_check_alignment(void);
85 83
86void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx);84void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx);
libavcodec/mpegvideo_enc.c+1−1
@@ -2713,7 +2713,7 @@ static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegE · 2712 unmodified lines
2713}2713}
2714 2714
2715static int sse(MpegEncContext *s, uint8_t *src1, uint8_t *src2, int w, int h, int stride){2715static int sse(MpegEncContext *s, uint8_t *src1, uint8_t *src2, int w, int h, int stride){
2716 uint32_t *sq = ff_square_tab + 256;2716 const uint32_t *sq = ff_square_tab + 256;
2717 int acc=0;2717 int acc=0;
2718 int x,y;2718 int x,y;
2719 2719
libavcodec/mpegvideoencdsp.c+1−1
@@ -81,7 +81,7 @@ static int pix_sum_c(uint8_t *pix, int line_size) · 80 unmodified lines
81static int pix_norm1_c(uint8_t *pix, int line_size)81static int pix_norm1_c(uint8_t *pix, int line_size)
82{82{
83 int s = 0, i, j;83 int s = 0, i, j;
84 uint32_t *sq = ff_square_tab + 256;84 const uint32_t *sq = ff_square_tab + 256;
85 85
86 for (i = 0; i < 16; i++) {86 for (i = 0; i < 16; i++) {
87 for (j = 0; j < 16; j += 8) {87 for (j = 0; j < 16; j += 8) {
libavcodec/snowenc.c+1−1
@@ -179,7 +179,7 @@ static int pix_sum(uint8_t * pix, int line_size, int w, int h) · 178 unmodified lines
179static int pix_norm1(uint8_t * pix, int line_size, int w)179static int pix_norm1(uint8_t * pix, int line_size, int w)
180{180{
181 int s, i, j;181 int s, i, j;
182 uint32_t *sq = ff_square_tab + 256;182 const uint32_t *sq = ff_square_tab + 256;
183 183
184 s = 0;184 s = 0;
185 for (i = 0; i < w; i++) {185 for (i = 0; i < w; i++) {
libavcodec/utils.c+0−13
@@ -104,18 +104,6 @@ AVCodec *av_codec_next(const AVCodec *c) · 103 unmodified lines
104 return first_avcodec;104 return first_avcodec;
105}105}
106 106
107static av_cold void avcodec_init(void)
108{
109 static int initialized = 0;
110
111 if (initialized != 0)
112 return;
113 initialized = 1;
114
115 if (CONFIG_ME_CMP)
116 ff_me_cmp_init_static();
117}
118
119int av_codec_is_encoder(const AVCodec *codec)107int av_codec_is_encoder(const AVCodec *codec)
120{108{
121 return codec && (codec->encode_sub || codec->encode2 ||codec->send_frame);109 return codec && (codec->encode_sub || codec->encode2 ||codec->send_frame);
@@ -131,7 +119,6 @@ static AVMutex codec_register_mutex = AV_MUTEX_INITIALIZER; · 9 unmodified lines
131av_cold void avcodec_register(AVCodec *codec)119av_cold void avcodec_register(AVCodec *codec)
132{120{
133 AVCodec **p;121 AVCodec **p;
134 avcodec_init();
135 122
136 ff_mutex_lock(&codec_register_mutex);123 ff_mutex_lock(&codec_register_mutex);
137 p = last_avcodec;124 p = last_avcodec;

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