Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
43de5065
Commit
43de5065
authored
17 years ago
by
Aurelien Jacobs
Browse files
Options
Downloads
Patches
Plain Diff
use ff_ prefix for extern vars
Originally committed as revision 11101 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
182f56cb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavcodec/i386/dsputil_mmx.c
+6
-6
6 additions, 6 deletions
libavcodec/i386/dsputil_mmx.c
libavcodec/i386/dsputil_mmx.h
+4
-4
4 additions, 4 deletions
libavcodec/i386/dsputil_mmx.h
libavcodec/i386/h264dsp_mmx.c
+4
-4
4 additions, 4 deletions
libavcodec/i386/h264dsp_mmx.c
with
14 additions
and
14 deletions
libavcodec/i386/dsputil_mmx.c
+
6
−
6
View file @
43de5065
...
@@ -41,10 +41,10 @@ extern void ff_idct_xvid_mmx2(short *block);
...
@@ -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 };
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
libavcodec/i386/dsputil_mmx.h
+
4
−
4
View file @
43de5065
...
@@ -22,10 +22,10 @@
...
@@ -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
];
...
...
This diff is collapsed.
Click to expand it.
libavcodec/i386/h264dsp_mmx.c
+
4
−
4
View file @
43de5065
...
@@ -364,7 +364,7 @@ static void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
...
@@ -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
...
@@ -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
...
@@ -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,
...
@@ -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
)
);
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment