History

Move avutil tables only used in libavcodec to libavcodec.

Diego Biurrun committed 14 years ago

Commit 9734b8b1 parent 0a75d1d14 files · +70 −85Browse files

Showing the changes to libavcodec (10 of 14 files). Show all

Unified · Split

10 files
  1. libavcodec/Makefile +1 −6
  2. libavcodec/arm/mathops.h +24 −0
  3. libavcodec/inverse.c +0 −1
  4. libavcodec/mathops.h +29 −0
  5. libavcodec/mathtables.c +68 −0
  6. libavcodec/motion_est.c +1 −1
  7. libavcodec/mpegvideo.c +1 −1
  8. libavcodec/mpegvideo_enc.c +1 −0
  9. libavcodec/ra144.c +1 −1
  10. libavcodec/roqaudioenc.c +1 −1
libavcodec/Makefile+1−6
@@ -22,6 +22,7 @@ OBJS = allcodecs.o \ · 21 unmodified lines
22 fmtconvert.o \22 fmtconvert.o \
23 imgconvert.o \23 imgconvert.o \
24 jrevdct.o \24 jrevdct.o \
25 mathtables.o \
25 options.o \26 options.o \
26 parser.o \27 parser.o \
27 raw.o \28 raw.o \
@@ -655,12 +656,6 @@ OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o · 627 unmodified lines
655OBJS-$(HAVE_PTHREADS) += pthread.o656OBJS-$(HAVE_PTHREADS) += pthread.o
656OBJS-$(HAVE_W32THREADS) += pthread.o657OBJS-$(HAVE_W32THREADS) += pthread.o
657 658
658# inverse.o contains the ff_inverse table definition, which is used by
659# the FASTDIV macro (from libavutil); since referencing the external
660# table has a negative effect on performance, copy it in libavcodec as
661# well.
662OBJS-$(!CONFIG_SMALL) += inverse.o
663
664SKIPHEADERS += %_tablegen.h \659SKIPHEADERS += %_tablegen.h \
665 %_tables.h \660 %_tables.h \
666 aac_tablegen_decl.h \661 aac_tablegen_decl.h \
libavcodec/arm/mathops.h+24−0
@@ -36,6 +36,30 @@ static inline av_const int MULH(int a, int b) · 35 unmodified lines
36 __asm__ ("smmul %0, %1, %2" : "=r"(r) : "r"(a), "r"(b));36 __asm__ ("smmul %0, %1, %2" : "=r"(r) : "r"(a), "r"(b));
37 return r;37 return r;
38}38}
39
40#define FASTDIV FASTDIV
41static av_always_inline av_const int FASTDIV(int a, int b)
42{
43 int r;
44 __asm__ ("cmp %2, #2 \n\t"
45 "ldr %0, [%3, %2, lsl #2] \n\t"
46 "ite le \n\t"
47 "lsrle %0, %1, #1 \n\t"
48 "smmulgt %0, %0, %1 \n\t"
49 : "=&r"(r) : "r"(a), "r"(b), "r"(ff_inverse) : "cc");
50 return r;
51}
52
53#else /* HAVE_ARMV6 */
54
55#define FASTDIV FASTDIV
56static av_always_inline av_const int FASTDIV(int a, int b)
57{
58 int r, t;
59 __asm__ ("umull %1, %0, %2, %3"
60 : "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b]));
61 return r;
62}
39#endif63#endif
40 64
41#define MLS64(d, a, b) MAC64(d, -(a), b)65#define MLS64(d, a, b) MAC64(d, -(a), b)
libavcodec/inverse.c+0−1
@@ -1 +0,0 @@
1#include "libavutil/inverse.c"
libavcodec/mathops.h+29−0
@@ -22,9 +22,14 @@ · 21 unmodified lines
22#ifndef AVCODEC_MATHOPS_H22#ifndef AVCODEC_MATHOPS_H
23#define AVCODEC_MATHOPS_H23#define AVCODEC_MATHOPS_H
24 24
25#include <stdint.h>
26
25#include "libavutil/common.h"27#include "libavutil/common.h"
26#include "config.h"28#include "config.h"
27 29
30extern const uint32_t ff_inverse[257];
31extern const uint8_t ff_sqrt_tab[256];
32
28#if ARCH_ARM33#if ARCH_ARM
29# include "arm/mathops.h"34# include "arm/mathops.h"
30#elif ARCH_AVR3235#elif ARCH_AVR32
@@ -185,4 +190,28 @@ if ((y) < (x)) {\ · 154 unmodified lines
185# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff)190# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff)
186#endif191#endif
187 192
193#ifndef FASTDIV
194# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
195#endif /* FASTDIV */
196
197static inline av_const unsigned int ff_sqrt(unsigned int a)
198{
199 unsigned int b;
200
201 if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4;
202 else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2;
203#if !CONFIG_SMALL
204 else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1;
205 else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8] ;
206#endif
207 else {
208 int s = av_log2_16bit(a >> 16) >> 1;
209 unsigned int c = a >> (s + 2);
210 b = ff_sqrt_tab[c >> (s + 8)];
211 b = FASTDIV(c,b) + (b << s);
212 }
213
214 return b - (a < b * b);
215}
216
188#endif /* AVCODEC_MATHOPS_H */217#endif /* AVCODEC_MATHOPS_H */
libavcodec/mathtables.c+68−0
@@ -0,0 +1,68 @@
1/*
2 * This file is part of Libav.
3 *
4 * Libav is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version.
8 *
9 * Libav is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details.
13 *
14 * You should have received a copy of the GNU Lesser General Public
15 * License along with Libav; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17 */
18
19#include <stdint.h>
20
21/* a*inverse[b]>>32 == a/b for all 0<=a<=16909558 && 2<=b<=256
22 * for a>16909558, is an overestimate by less than 1 part in 1<<24 */
23const uint32_t ff_inverse[257]={
24 0, 4294967295U,2147483648U,1431655766, 1073741824, 858993460, 715827883, 613566757,
25 536870912, 477218589, 429496730, 390451573, 357913942, 330382100, 306783379, 286331154,
26 268435456, 252645136, 238609295, 226050911, 214748365, 204522253, 195225787, 186737709,
27 178956971, 171798692, 165191050, 159072863, 153391690, 148102321, 143165577, 138547333,
28 134217728, 130150525, 126322568, 122713352, 119304648, 116080198, 113025456, 110127367,
29 107374183, 104755300, 102261127, 99882961, 97612894, 95443718, 93368855, 91382283,
30 89478486, 87652394, 85899346, 84215046, 82595525, 81037119, 79536432, 78090315,
31 76695845, 75350304, 74051161, 72796056, 71582789, 70409300, 69273667, 68174085,
32 67108864, 66076420, 65075263, 64103990, 63161284, 62245903, 61356676, 60492498,
33 59652324, 58835169, 58040099, 57266231, 56512728, 55778797, 55063684, 54366675,
34 53687092, 53024288, 52377650, 51746594, 51130564, 50529028, 49941481, 49367441,
35 48806447, 48258060, 47721859, 47197443, 46684428, 46182445, 45691142, 45210183,
36 44739243, 44278014, 43826197, 43383509, 42949673, 42524429, 42107523, 41698712,
37 41297763, 40904451, 40518560, 40139882, 39768216, 39403370, 39045158, 38693400,
38 38347923, 38008561, 37675152, 37347542, 37025581, 36709123, 36398028, 36092163,
39 35791395, 35495598, 35204650, 34918434, 34636834, 34359739, 34087043, 33818641,
40 33554432, 33294321, 33038210, 32786010, 32537632, 32292988, 32051995, 31814573,
41 31580642, 31350127, 31122952, 30899046, 30678338, 30460761, 30246249, 30034737,
42 29826162, 29620465, 29417585, 29217465, 29020050, 28825284, 28633116, 28443493,
43 28256364, 28071682, 27889399, 27709467, 27531842, 27356480, 27183338, 27012373,
44 26843546, 26676816, 26512144, 26349493, 26188825, 26030105, 25873297, 25718368,
45 25565282, 25414008, 25264514, 25116768, 24970741, 24826401, 24683721, 24542671,
46 24403224, 24265352, 24129030, 23994231, 23860930, 23729102, 23598722, 23469767,
47 23342214, 23216040, 23091223, 22967740, 22845571, 22724695, 22605092, 22486740,
48 22369622, 22253717, 22139007, 22025474, 21913099, 21801865, 21691755, 21582751,
49 21474837, 21367997, 21262215, 21157475, 21053762, 20951060, 20849356, 20748635,
50 20648882, 20550083, 20452226, 20355296, 20259280, 20164166, 20069941, 19976593,
51 19884108, 19792477, 19701685, 19611723, 19522579, 19434242, 19346700, 19259944,
52 19173962, 19088744, 19004281, 18920561, 18837576, 18755316, 18673771, 18592933,
53 18512791, 18433337, 18354562, 18276457, 18199014, 18122225, 18046082, 17970575,
54 17895698, 17821442, 17747799, 17674763, 17602325, 17530479, 17459217, 17388532,
55 17318417, 17248865, 17179870, 17111424, 17043522, 16976156, 16909321, 16843010,
56 16777216
57};
58
59const uint8_t ff_sqrt_tab[256]={
60 0, 16, 23, 28, 32, 36, 40, 43, 46, 48, 51, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90,
61 91, 92, 94, 95, 96, 98, 99,100,102,103,104,105,107,108,109,110,111,112,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
62128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,151,152,153,154,155,156,156,
63157,158,159,160,160,161,162,163,164,164,165,166,167,168,168,169,170,171,171,172,173,174,174,175,176,176,177,178,179,179,180,181,
64182,182,183,184,184,185,186,186,187,188,188,189,190,190,191,192,192,193,194,194,195,196,196,197,198,198,199,200,200,201,202,202,
65203,204,204,205,205,206,207,207,208,208,209,210,210,211,212,212,213,213,214,215,215,216,216,217,218,218,219,219,220,220,221,222,
66222,223,223,224,224,225,226,226,227,227,228,228,229,230,230,231,231,232,232,233,233,234,235,235,236,236,237,237,238,238,239,239,
67240,240,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,255,255
68};
libavcodec/motion_est.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
30#include <stdlib.h>30#include <stdlib.h>
31#include <stdio.h>31#include <stdio.h>
32#include <limits.h>32#include <limits.h>
33#include "libavutil/intmath.h"33
34#include "avcodec.h"34#include "avcodec.h"
35#include "dsputil.h"35#include "dsputil.h"
36#include "mathops.h"36#include "mathops.h"
libavcodec/mpegvideo.c+1−1
@@ -27,11 +27,11 @@ · 26 unmodified lines
27 * The simplest mpeg encoder (well, it was the simplest!).27 * The simplest mpeg encoder (well, it was the simplest!).
28 */28 */
29 29
30#include "libavutil/intmath.h"
31#include "libavutil/imgutils.h"30#include "libavutil/imgutils.h"
32#include "avcodec.h"31#include "avcodec.h"
33#include "dsputil.h"32#include "dsputil.h"
34#include "internal.h"33#include "internal.h"
34#include "mathops.h"
35#include "mpegvideo.h"35#include "mpegvideo.h"
36#include "mjpegenc.h"36#include "mjpegenc.h"
37#include "msmpeg4.h"37#include "msmpeg4.h"
libavcodec/mpegvideo_enc.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
34#include "dsputil.h"34#include "dsputil.h"
35#include "mpegvideo.h"35#include "mpegvideo.h"
36#include "h263.h"36#include "h263.h"
37#include "mathops.h"
37#include "mjpegenc.h"38#include "mjpegenc.h"
38#include "msmpeg4.h"39#include "msmpeg4.h"
39#include "faandct.h"40#include "faandct.h"
libavcodec/ra144.c+1−1
@@ -22,8 +22,8 @@ · 21 unmodified lines
22#include <stdint.h>22#include <stdint.h>
23#include "avcodec.h"23#include "avcodec.h"
24#include "celp_filters.h"24#include "celp_filters.h"
25#include "mathops.h"
25#include "ra144.h"26#include "ra144.h"
26#include "libavutil/common.h"
27 27
28const int16_t ff_gain_val_tab[256][3] = {28const int16_t ff_gain_val_tab[256][3] = {
29 { 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668},29 { 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668},
libavcodec/roqaudioenc.c+1−1
@@ -21,10 +21,10 @@ · 20 unmodified lines
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 */22 */
23 23
24#include "libavutil/intmath.h"
25#include "avcodec.h"24#include "avcodec.h"
26#include "bytestream.h"25#include "bytestream.h"
27#include "internal.h"26#include "internal.h"
27#include "mathops.h"
28 28
29#define ROQ_FRAME_SIZE 73529#define ROQ_FRAME_SIZE 735
30#define ROQ_HEADER_SIZE 830#define ROQ_HEADER_SIZE 8

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