highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: xvid: K&R formatting cosmetics

Browse Source
This commit is contained in:
Diego Biurrun
2014-08-27 02:58:08 +02:00
parent dcb7c868ec
commit 8d27bf1cff
2 changed files with 474 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/x86/xvididct_mmx.c
View File

@@ -42,9 +42,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "config.h" #include "config.h"
#include "libavcodec/avcodec.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavcodec/avcodec.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "xvididct.h" #include "xvididct.h"
@@ -54,12 +56,12 @@
// Various memory constants (trigonometric values or rounding values) // Various memory constants (trigonometric values or rounding values)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
DECLARE_ALIGNED(8, static const int16_t, tg_1_16)[4 * 4] = { DECLARE_ALIGNED(8, static const int16_t, tg_1_16)[4 * 4] = {
13036, 13036, 13036, 13036, // tg * (2 << 16) + 0.5 13036, 13036, 13036, 13036, // tg * (2 << 16) + 0.5
27146, 27146, 27146, 27146, // tg * (2 << 16) + 0.5 27146, 27146, 27146, 27146, // tg * (2 << 16) + 0.5
-21746, -21746, -21746, -21746, // tg * (2 << 16) + 0.5 -21746, -21746, -21746, -21746, // tg * (2 << 16) + 0.5
23170,23170,23170,23170}; // cos * (2<<15) + 0.5 23170, 23170, 23170, 23170
}; // cos * (2 << 15) + 0.5
DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2 * 8] = { DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2 * 8] = {
65536, 65536, 65536, 65536,
@@ -69,7 +71,8 @@ DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2*8] = {
0, 0, 0, 0,
120, 120, 120, 120,
512, 512, 512, 512,
512,512}; 512, 512
};
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// //
@@ -119,7 +122,7 @@ DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2*8] = {
// for rows 1,7 - by cos_1_16, // for rows 1,7 - by cos_1_16,
// for rows 2,6 - by cos_2_16, // for rows 2,6 - by cos_2_16,
// for rows 3,5 - by cos_3_16 // for rows 3,5 - by cos_3_16
// and are shifted to the left for better accuracy // and are shifted to the left for better accuracy.
// //
// For the constants used, // For the constants used,
// FIX(float_const) = (short) (float_const * (1 << 15) + 0.5) // FIX(float_const) = (short) (float_const * (1 << 15) + 0.5)
@@ -462,7 +465,7 @@ DECLARE_ALIGNED(8, static const int16_t, tab_i_04_xmm)[32*4] = {
"movq %%mm4, 7*16+"#A2" \n\t" \ "movq %%mm4, 7*16+"#A2" \n\t" \
"psraw $6, %%mm6 \n\t" /* dst4 */ \ "psraw $6, %%mm6 \n\t" /* dst4 */ \
"movq %%mm2, 3*16+"#A2" \n\t" \ "movq %%mm2, 3*16+"#A2" \n\t" \
"movq %%mm6,4*16+" #A2 "\n\t" "movq %%mm6, 4*16+"#A2" \n\t" \
// ============================================================================= // =============================================================================
// Code // Code
@@ -472,7 +475,6 @@ DECLARE_ALIGNED(8, static const int16_t, tab_i_04_xmm)[32*4] = {
// void idct_mmx(uint16_t block[64]); // void idct_mmx(uint16_t block[64]);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void ff_xvid_idct_mmx(short *block) void ff_xvid_idct_mmx(short *block)
{ {
__asm__ volatile ( __asm__ volatile (
@@ -512,7 +514,6 @@ void ff_xvid_idct_mmx_add(uint8_t *dest, int line_size, int16_t *block)
// void idct_xmm(uint16_t block[64]); // void idct_xmm(uint16_t block[64]);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void ff_xvid_idct_mmxext(short *block) void ff_xvid_idct_mmxext(short *block)
{ {
__asm__ volatile ( __asm__ volatile (

3
libavcodec/x86/xvididct_sse2.c
View File

@@ -387,8 +387,7 @@ inline void ff_xvid_idct_sse2(short *block)
XMM_CLOBBERS("%xmm8", "%xmm9", "%xmm10", "%xmm11", XMM_CLOBBERS("%xmm8", "%xmm9", "%xmm10", "%xmm11",
"%xmm12", "%xmm13", "%xmm14", ) "%xmm12", "%xmm13", "%xmm14", )
#endif #endif
"%eax", "%ecx", "%edx", "%esi", "memory" "%eax", "%ecx", "%edx", "%esi", "memory");
);
} }
void ff_xvid_idct_sse2_put(uint8_t *dest, int line_size, short *block) void ff_xvid_idct_sse2_put(uint8_t *dest, int line_size, short *block)