Ticket #1713: ffmpeg-2.2.patch

File ffmpeg-2.2.patch, 15.1 KB (added by robelsharma, 5 years ago)
Line 
1Only in ffmpeg: .config
2Only in ffmpeg: config.asm
3Only in ffmpeg: config.fate
4Only in ffmpeg: config.h
5Only in ffmpeg: config.log
6Only in ffmpeg: config.mak
7Only in ffmpeg/doc: config.texi
8Only in ffmpeg/doc/examples: pc-uninstalled
9diff -crB FFmpeg-n2.2/libavcodec/ac3dsp.h ffmpeg/libavcodec/ac3dsp.h
10*** FFmpeg-n2.2/libavcodec/ac3dsp.h     2014-03-24 02:13:49.000000000 +0600
11--- ffmpeg/libavcodec/ac3dsp.h  2014-08-21 12:50:49.902856377 +0600
12***************
13*** 28,34 ****
14   * Number of mantissa bits written for each bap value.
15   * bap values with fractional bits are set to 0 and are calculated separately.
16   */
17! extern const uint16_t ff_ac3_bap_bits[16];
18 
19  typedef struct AC3DSPContext {
20      /**
21--- 28,34 ----
22   * Number of mantissa bits written for each bap value.
23   * bap values with fractional bits are set to 0 and are calculated separately.
24   */
25! extern const uint16_t __attribute__((visibility("hidden")))ff_ac3_bap_bits[16];
26 
27  typedef struct AC3DSPContext {
28      /**
29diff -crB FFmpeg-n2.2/libavcodec/cabac.c ffmpeg/libavcodec/cabac.c
30*** FFmpeg-n2.2/libavcodec/cabac.c      2014-03-24 02:13:49.000000000 +0600
31--- ffmpeg/libavcodec/cabac.c   2014-08-21 10:40:41.181857307 +0600
32***************
33*** 32,38 ****
34  #include "cabac.h"
35  #include "cabac_functions.h"
36 
37! uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63] = {
38   9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5,
39   4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
40   3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
41--- 32,38 ----
42  #include "cabac.h"
43  #include "cabac_functions.h"
44 
45! uint8_t __attribute__((visibility("hidden")))ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63] = {
46   9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5,
47   4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
48   3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
49***************
50*** 55,61 ****
51   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
52  };
53 
54! static const uint8_t lps_range[64][4]= {
55  {128,176,208,240}, {128,167,197,227}, {128,158,187,216}, {123,150,178,205},
56  {116,142,169,195}, {111,135,160,185}, {105,128,152,175}, {100,122,144,166},
57  { 95,116,137,158}, { 90,110,130,150}, { 85,104,123,142}, { 81, 99,117,135},
58--- 55,61 ----
59   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
60  };
61 
62! static const uint8_t __attribute__((visibility("hidden")))lps_range[64][4]= {
63  {128,176,208,240}, {128,167,197,227}, {128,158,187,216}, {123,150,178,205},
64  {116,142,169,195}, {111,135,160,185}, {105,128,152,175}, {100,122,144,166},
65  { 95,116,137,158}, { 90,110,130,150}, { 85,104,123,142}, { 81, 99,117,135},
66diff -crB FFmpeg-n2.2/libavcodec/fft.h ffmpeg/libavcodec/fft.h
67*** FFmpeg-n2.2/libavcodec/fft.h        2014-03-24 02:13:49.000000000 +0600
68--- ffmpeg/libavcodec/fft.h     2014-08-21 12:15:18.355856631 +0600
69***************
70*** 113,119 ****
71  #endif
72 
73  #define COSTABLE(size) \
74!     COSTABLE_CONST DECLARE_ALIGNED(32, FFTSample, FFT_NAME(ff_cos_##size))[size/2]
75 
76  extern COSTABLE(16);
77  extern COSTABLE(32);
78--- 113,119 ----
79  #endif
80 
81  #define COSTABLE(size) \
82!     COSTABLE_CONST DECLARE_ALIGNED(32, FFTSample, __attribute__((visibility("hidden")))FFT_NAME(ff_cos_##size))[size/2]
83 
84  extern COSTABLE(16);
85  extern COSTABLE(32);
86diff -crB FFmpeg-n2.2/libavcodec/h263dsp.h ffmpeg/libavcodec/h263dsp.h
87*** FFmpeg-n2.2/libavcodec/h263dsp.h    2014-03-24 02:13:49.000000000 +0600
88--- ffmpeg/libavcodec/h263dsp.h 2014-08-21 12:35:22.542856487 +0600
89***************
90*** 21,27 ****
91 
92  #include <stdint.h>
93 
94! extern const uint8_t ff_h263_loop_filter_strength[32];
95 
96  typedef struct H263DSPContext {
97      void (*h263_h_loop_filter)(uint8_t *src, int stride, int qscale);
98--- 21,27 ----
99 
100  #include <stdint.h>
101 
102! extern const uint8_t __attribute__((visibility("hidden")))ff_h263_loop_filter_strength[32];
103 
104  typedef struct H263DSPContext {
105      void (*h263_h_loop_filter)(uint8_t *src, int stride, int qscale);
106Only in ffmpeg/libavcodec: libavcodec.pc
107diff -crB FFmpeg-n2.2/libavcodec/sbrdsp.h ffmpeg/libavcodec/sbrdsp.h
108*** FFmpeg-n2.2/libavcodec/sbrdsp.h     2014-03-24 02:13:49.000000000 +0600
109--- ffmpeg/libavcodec/sbrdsp.h  2014-08-21 13:31:36.592856083 +0600
110***************
111*** 42,48 ****
112                                int kx, int m_max);
113  } SBRDSPContext;
114 
115! extern const float ff_sbr_noise_table[][2];
116 
117  void ff_sbrdsp_init(SBRDSPContext *s);
118  void ff_sbrdsp_init_arm(SBRDSPContext *s);
119--- 42,48 ----
120                                int kx, int m_max);
121  } SBRDSPContext;
122 
123! extern const float __attribute__((visibility("hidden")))ff_sbr_noise_table[][2];
124 
125  void ff_sbrdsp_init(SBRDSPContext *s);
126  void ff_sbrdsp_init_arm(SBRDSPContext *s);
127diff -crB FFmpeg-n2.2/libavcodec/x86/constants.c ffmpeg/libavcodec/x86/constants.c
128*** FFmpeg-n2.2/libavcodec/x86/constants.c      2014-03-24 02:13:49.000000000 +0600
129--- ffmpeg/libavcodec/x86/constants.c   2014-08-21 09:49:02.325857678 +0600
130***************
131*** 24,53 ****
132 
133  DECLARE_ALIGNED(8,  const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
134 
135! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_1)    = { 0x0001000100010001ULL, 0x0001000100010001ULL };
136! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_2)    = { 0x0002000200020002ULL, 0x0002000200020002ULL };
137! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_3)    = { 0x0003000300030003ULL, 0x0003000300030003ULL };
138! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_4)    = { 0x0004000400040004ULL, 0x0004000400040004ULL };
139! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_5)    = { 0x0005000500050005ULL, 0x0005000500050005ULL };
140! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_8)    = { 0x0008000800080008ULL, 0x0008000800080008ULL };
141! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_9)    = { 0x0009000900090009ULL, 0x0009000900090009ULL };
142! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_15)   =   0x000F000F000F000FULL;
143! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_16)   = { 0x0010001000100010ULL, 0x0010001000100010ULL };
144! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_17)   = { 0x0011001100110011ULL, 0x0011001100110011ULL };
145! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_18)   = { 0x0012001200120012ULL, 0x0012001200120012ULL };
146! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_20)   =   0x0014001400140014ULL;
147! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_32)   = { 0x0020002000200020ULL, 0x0020002000200020ULL };
148! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_42)   =   0x002A002A002A002AULL;
149! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_53)   =   0x0035003500350035ULL;
150! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_64)   = { 0x0040004000400040ULL, 0x0040004000400040ULL };
151! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_96)   =   0x0060006000600060ULL;
152! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_128)  =   0x0080008000800080ULL;
153! DECLARE_ALIGNED(8,  const uint64_t, ff_pw_255)  =   0x00ff00ff00ff00ffULL;
154! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_512)  = { 0x0200020002000200ULL, 0x0200020002000200ULL };
155! DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_1019) = { 0x03FB03FB03FB03FBULL, 0x03FB03FB03FB03FBULL };
156 
157! DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_0)    = { 0x0000000000000000ULL, 0x0000000000000000ULL };
158! DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_1)    = { 0x0101010101010101ULL, 0x0101010101010101ULL };
159! DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_3)    = { 0x0303030303030303ULL, 0x0303030303030303ULL };
160! DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_80)   = { 0x8080808080808080ULL, 0x8080808080808080ULL };
161! DECLARE_ALIGNED(8,  const uint64_t, ff_pb_FC)   =   0xFCFCFCFCFCFCFCFCULL;
162--- 24,53 ----
163 
164  DECLARE_ALIGNED(8,  const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
165 
166! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_1)    = { 0x0001000100010001ULL, 0x0001000100010001ULL };
167! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_2)    = { 0x0002000200020002ULL, 0x0002000200020002ULL };
168! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_3)    = { 0x0003000300030003ULL, 0x0003000300030003ULL };
169! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_4)    = { 0x0004000400040004ULL, 0x0004000400040004ULL };
170! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_5)    = { 0x0005000500050005ULL, 0x0005000500050005ULL };
171! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_8)    = { 0x0008000800080008ULL, 0x0008000800080008ULL };
172! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_9)    = { 0x0009000900090009ULL, 0x0009000900090009ULL };
173! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_15)   =   0x000F000F000F000FULL;
174! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_16)   = { 0x0010001000100010ULL, 0x0010001000100010ULL };
175! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_17)   = { 0x0011001100110011ULL, 0x0011001100110011ULL };
176! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_18)   = { 0x0012001200120012ULL, 0x0012001200120012ULL };
177! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_20)   =   0x0014001400140014ULL;
178! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_32)   = { 0x0020002000200020ULL, 0x0020002000200020ULL };
179! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_42)   =   0x002A002A002A002AULL;
180! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_53)   =   0x0035003500350035ULL;
181! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_64)   = { 0x0040004000400040ULL, 0x0040004000400040ULL };
182! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_96)   =   0x0060006000600060ULL;
183! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_128)  =   0x0080008000800080ULL;
184! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pw_255)  =   0x00ff00ff00ff00ffULL;
185! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_512)  = { 0x0200020002000200ULL, 0x0200020002000200ULL };
186! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pw_1019) = { 0x03FB03FB03FB03FBULL, 0x03FB03FB03FB03FBULL };
187 
188! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pb_0)    = { 0x0000000000000000ULL, 0x0000000000000000ULL };
189! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pb_1)    = { 0x0101010101010101ULL, 0x0101010101010101ULL };
190! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pb_3)    = { 0x0303030303030303ULL, 0x0303030303030303ULL };
191! DECLARE_ALIGNED(16, const xmm_reg,  __attribute__((visibility("hidden")))ff_pb_80)   = { 0x8080808080808080ULL, 0x8080808080808080ULL };
192! DECLARE_ALIGNED(8,  const uint64_t, __attribute__((visibility("hidden")))ff_pb_FC)   =   0xFCFCFCFCFCFCFCFCULL;
193Only in ffmpeg/libavdevice: libavdevice.pc
194Only in ffmpeg/libavfilter: libavfilter.pc
195Only in ffmpeg/libavformat: libavformat.pc
196Only in ffmpeg/libavutil: avconfig.h
197Only in ffmpeg/libavutil: ffversion.h
198Only in ffmpeg/libavutil: libavutil.pc
199Only in ffmpeg/libpostproc: libpostproc.pc
200Only in ffmpeg/libswresample: libswresample.pc
201Only in ffmpeg/libswscale: libswscale.pc
202diff -crB FFmpeg-n2.2/libswscale/x86/swscale.c ffmpeg/libswscale/x86/swscale.c
203*** FFmpeg-n2.2/libswscale/x86/swscale.c        2014-03-24 02:13:49.000000000 +0600
204--- ffmpeg/libswscale/x86/swscale.c     2014-08-21 10:16:35.462857474 +0600
205***************
206*** 34,43 ****
207 
208  #define DITHER1XBPP
209 
210! DECLARE_ASM_CONST(8, uint64_t, bF8)=       0xF8F8F8F8F8F8F8F8LL;
211! DECLARE_ASM_CONST(8, uint64_t, bFC)=       0xFCFCFCFCFCFCFCFCLL;
212! DECLARE_ASM_CONST(8, uint64_t, w10)=       0x0010001000100010LL;
213! DECLARE_ASM_CONST(8, uint64_t, w02)=       0x0002000200020002LL;
214 
215  const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = {
216      0x0103010301030103LL,
217--- 34,43 ----
218 
219  #define DITHER1XBPP
220 
221! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))bF8)=       0xF8F8F8F8F8F8F8F8LL;
222! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))bFC)=       0xFCFCFCFCFCFCFCFCLL;
223! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))w10)=       0x0010001000100010LL;
224! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))w02)=       0x0002000200020002LL;
225 
226  const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = {
227      0x0103010301030103LL,
228***************
229*** 47,70 ****
230      0x0602060206020602LL,
231      0x0004000400040004LL,};
232 
233! DECLARE_ASM_CONST(8, uint64_t, b16Mask)=   0x001F001F001F001FLL;
234! DECLARE_ASM_CONST(8, uint64_t, g16Mask)=   0x07E007E007E007E0LL;
235! DECLARE_ASM_CONST(8, uint64_t, r16Mask)=   0xF800F800F800F800LL;
236! DECLARE_ASM_CONST(8, uint64_t, b15Mask)=   0x001F001F001F001FLL;
237! DECLARE_ASM_CONST(8, uint64_t, g15Mask)=   0x03E003E003E003E0LL;
238! DECLARE_ASM_CONST(8, uint64_t, r15Mask)=   0x7C007C007C007C00LL;
239!
240! DECLARE_ALIGNED(8, const uint64_t, ff_M24A)         = 0x00FF0000FF0000FFLL;
241! DECLARE_ALIGNED(8, const uint64_t, ff_M24B)         = 0xFF0000FF0000FF00LL;
242! DECLARE_ALIGNED(8, const uint64_t, ff_M24C)         = 0x0000FF0000FF0000LL;
243!
244! DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff)   = 0x000020E540830C8BULL;
245! DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff)   = 0x0000ED0FDAC23831ULL;
246! DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff)   = 0x00003831D0E6F6EAULL;
247!
248! DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YOffset)  = 0x1010101010101010ULL;
249! DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL;
250! DECLARE_ALIGNED(8, const uint64_t, ff_w1111)        = 0x0001000100010001ULL;
251 
252 
253  //MMX versions
254--- 47,70 ----
255      0x0602060206020602LL,
256      0x0004000400040004LL,};
257 
258! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))b16Mask)=   0x001F001F001F001FLL;
259! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))g16Mask)=   0x07E007E007E007E0LL;
260! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))r16Mask)=   0xF800F800F800F800LL;
261! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))b15Mask)=   0x001F001F001F001FLL;
262! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))g15Mask)=   0x03E003E003E003E0LL;
263! DECLARE_ASM_CONST(8, uint64_t, __attribute__((visibility("hidden")))r15Mask)=   0x7C007C007C007C00LL;
264!
265! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_M24A)         = 0x00FF0000FF0000FFLL;
266! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_M24B)         = 0xFF0000FF0000FF00LL;
267! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_M24C)         = 0x0000FF0000FF0000LL;
268!
269! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_bgr2YCoeff)   = 0x000020E540830C8BULL;
270! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_bgr2UCoeff)   = 0x0000ED0FDAC23831ULL;
271! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_bgr2VCoeff)   = 0x00003831D0E6F6EAULL;
272!
273! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_bgr2YOffset)  = 0x1010101010101010ULL;
274! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_bgr2UVOffset) = 0x8080808080808080ULL;
275! DECLARE_ALIGNED(8, const uint64_t, __attribute__((visibility("hidden")))ff_w1111)        = 0x0001000100010001ULL;
276 
277 
278  //MMX versions
279Only in ffmpeg: .version