Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

use ff_ prefix for extern vars

Browse Source 
Originally committed as revision 11101 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 17 years ago
parent 182f56cb0c
commit 43de50659b
3 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavcodec/i386/dsputil_mmx.c
  2. 8
      libavcodec/i386/dsputil_mmx.h
  3. 8
      libavcodec/i386/h264dsp_mmx.c

12
libavcodec/i386/dsputil_mmx.c
Unescape View File

@ -41,10 +41,10 @@ extern void ff_idct_xvid_mmx2(short *block);
int mm_flags; /* multimedia extension flags */ int mm_flags; /* multimedia extension flags */
/* pixel operations */ /* pixel operations */
DECLARE_ALIGNED_8 (const uint64_t, mm_bone) = 0x0101010101010101ULL; DECLARE_ALIGNED_8 (const uint64_t, ff_bone) = 0x0101010101010101ULL;
DECLARE_ALIGNED_8 (const uint64_t, mm_wone) = 0x0001000100010001ULL; DECLARE_ALIGNED_8 (const uint64_t, ff_wone) = 0x0001000100010001ULL;
DECLARE_ALIGNED_8 (const uint64_t, mm_wtwo) = 0x0002000200020002ULL; DECLARE_ALIGNED_8 (const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
DECLARE_ALIGNED_8 (const uint64_t, mm_wabs) = 0xFFFFFFFFFFFFFFFFULL; DECLARE_ALIGNED_8 (const uint64_t, ff_wabs) = 0xFFFFFFFFFFFFFFFFULL;
DECLARE_ALIGNED_16(const uint64_t, ff_pdw_80000000[2]) = DECLARE_ALIGNED_16(const uint64_t, ff_pdw_80000000[2]) =
{0x8000000080000000ULL, 0x8000000080000000ULL}; {0x8000000080000000ULL, 0x8000000080000000ULL};
@ -87,8 +87,8 @@ DECLARE_ALIGNED_16(const double, ff_pd_2[2]) = { 2.0, 2.0 };
"paddb %%" #regd ", %%" #regd " \n\t" ::) "paddb %%" #regd ", %%" #regd " \n\t" ::)
#ifndef PIC #ifndef PIC
#define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone)) #define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(ff_bone))
#define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo)) #define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(ff_wtwo))
#else #else
// for shared library it's better to use this way for accessing constants // for shared library it's better to use this way for accessing constants
// pcmpeqd -> -1 // pcmpeqd -> -1

8
libavcodec/i386/dsputil_mmx.h
Unescape View File

@ -22,10 +22,10 @@
#ifndef FFMPEG_DSPUTIL_MMX_H #ifndef FFMPEG_DSPUTIL_MMX_H
#define FFMPEG_DSPUTIL_MMX_H #define FFMPEG_DSPUTIL_MMX_H
extern const uint64_t mm_bone; extern const uint64_t ff_bone;
extern const uint64_t mm_wone; extern const uint64_t ff_wone;
extern const uint64_t mm_wtwo; extern const uint64_t ff_wtwo;
extern const uint64_t mm_wabs; extern const uint64_t ff_wabs;
extern const uint64_t ff_pdw_80000000[2]; extern const uint64_t ff_pdw_80000000[2];

8
libavcodec/i386/h264dsp_mmx.c
Unescape View File

@ -364,7 +364,7 @@ static void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
"paddusb %%mm3 , %%mm1 \n\t"\ "paddusb %%mm3 , %%mm1 \n\t"\
"paddusb %%mm6 , %%mm2 \n\t" "paddusb %%mm6 , %%mm2 \n\t"
// in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=mm_bone // in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=ff_bone
// out: (q1addr) = av_clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 ) // out: (q1addr) = av_clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 )
// clobbers: q2, tmp, tc0 // clobbers: q2, tmp, tc0
#define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\ #define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\
@ -430,7 +430,7 @@ static inline void h264_loop_filter_luma_mmx2(uint8_t *pix, int stride, int alph
: "=m"(*tmp0) : "=m"(*tmp0)
: "r"(pix-3*stride), "r"(pix), "r"((long)stride), : "r"(pix-3*stride), "r"(pix), "r"((long)stride),
"m"(*tmp0/*unused*/), "m"(*(uint32_t*)tc0), "m"(alpha1), "m"(beta1), "m"(*tmp0/*unused*/), "m"(*(uint32_t*)tc0), "m"(alpha1), "m"(beta1),
"m"(mm_bone) "m"(ff_bone)
); );
} }
@ -477,7 +477,7 @@ static inline void h264_loop_filter_chroma_mmx2(uint8_t *pix, int stride, int al
:: "r"(pix-2*stride), "r"(pix), "r"((long)stride), :: "r"(pix-2*stride), "r"(pix), "r"((long)stride),
"r"(*(uint32_t*)tc0), "r"(*(uint32_t*)tc0),
"m"(alpha1), "m"(beta1), "m"(mm_bone), "m"(ff_pb_3F) "m"(alpha1), "m"(beta1), "m"(ff_bone), "m"(ff_pb_3F)
); );
} }
@ -527,7 +527,7 @@ static inline void h264_loop_filter_chroma_intra_mmx2(uint8_t *pix, int stride,
"movq %%mm1, (%0,%2) \n\t" "movq %%mm1, (%0,%2) \n\t"
"movq %%mm2, (%1) \n\t" "movq %%mm2, (%1) \n\t"
:: "r"(pix-2*stride), "r"(pix), "r"((long)stride), :: "r"(pix-2*stride), "r"(pix), "r"((long)stride),
"m"(alpha1), "m"(beta1), "m"(mm_bone) "m"(alpha1), "m"(beta1), "m"(ff_bone)
); );
} }

Write Preview
Loading…
Cancel
Save