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
9d03cb9f
Commit
9d03cb9f
authored
13 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
swscale: Remove some write-only variables related to alpha handling.
parent
771bab7f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libswscale/swscale_internal.h
+0
-1
0 additions, 1 deletion
libswscale/swscale_internal.h
libswscale/x86/swscale_mmx.c
+0
-14
0 additions, 14 deletions
libswscale/x86/swscale_mmx.c
with
0 additions
and
15 deletions
libswscale/swscale_internal.h
+
0
−
1
View file @
9d03cb9f
...
@@ -378,7 +378,6 @@ typedef struct SwsContext {
...
@@ -378,7 +378,6 @@ typedef struct SwsContext {
DECLARE_ALIGNED
(
8
,
uint64_t
,
u_temp
);
DECLARE_ALIGNED
(
8
,
uint64_t
,
u_temp
);
DECLARE_ALIGNED
(
8
,
uint64_t
,
v_temp
);
DECLARE_ALIGNED
(
8
,
uint64_t
,
v_temp
);
DECLARE_ALIGNED
(
8
,
uint64_t
,
y_temp
);
DECLARE_ALIGNED
(
8
,
uint64_t
,
y_temp
);
int32_t
alpMmxFilter
[
4
*
MAX_FILTER_SIZE
];
// alignment of these values is not necessary, but merely here
// alignment of these values is not necessary, but merely here
// to maintain the same offset across x8632 and x86-64. Once we
// to maintain the same offset across x8632 and x86-64. Once we
// use proper offset macros in the asm, they can be removed.
// use proper offset macros in the asm, they can be removed.
...
...
This diff is collapsed.
Click to expand it.
libswscale/x86/swscale_mmx.c
+
0
−
14
View file @
9d03cb9f
...
@@ -90,7 +90,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
...
@@ -90,7 +90,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
const
int
flags
=
c
->
flags
;
const
int
flags
=
c
->
flags
;
int16_t
**
lumPixBuf
=
c
->
lumPixBuf
;
int16_t
**
lumPixBuf
=
c
->
lumPixBuf
;
int16_t
**
chrUPixBuf
=
c
->
chrUPixBuf
;
int16_t
**
chrUPixBuf
=
c
->
chrUPixBuf
;
int16_t
**
alpPixBuf
=
c
->
alpPixBuf
;
const
int
vLumBufSize
=
c
->
vLumBufSize
;
const
int
vLumBufSize
=
c
->
vLumBufSize
;
const
int
vChrBufSize
=
c
->
vChrBufSize
;
const
int
vChrBufSize
=
c
->
vChrBufSize
;
int16_t
*
vLumFilterPos
=
c
->
vLumFilterPos
;
int16_t
*
vLumFilterPos
=
c
->
vLumFilterPos
;
...
@@ -99,7 +98,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
...
@@ -99,7 +98,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
int16_t
*
vChrFilter
=
c
->
vChrFilter
;
int16_t
*
vChrFilter
=
c
->
vChrFilter
;
int32_t
*
lumMmxFilter
=
c
->
lumMmxFilter
;
int32_t
*
lumMmxFilter
=
c
->
lumMmxFilter
;
int32_t
*
chrMmxFilter
=
c
->
chrMmxFilter
;
int32_t
*
chrMmxFilter
=
c
->
chrMmxFilter
;
int32_t
av_unused
*
alpMmxFilter
=
c
->
alpMmxFilter
;
const
int
vLumFilterSize
=
c
->
vLumFilterSize
;
const
int
vLumFilterSize
=
c
->
vLumFilterSize
;
const
int
vChrFilterSize
=
c
->
vChrFilterSize
;
const
int
vChrFilterSize
=
c
->
vChrFilterSize
;
const
int
chrDstY
=
dstY
>>
c
->
chrDstVSubSample
;
const
int
chrDstY
=
dstY
>>
c
->
chrDstVSubSample
;
...
@@ -115,7 +113,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
...
@@ -115,7 +113,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
if
(
dstY
<
dstH
-
2
)
{
if
(
dstY
<
dstH
-
2
)
{
const
int16_t
**
lumSrcPtr
=
(
const
int16_t
**
)
lumPixBuf
+
lumBufIndex
+
firstLumSrcY
-
lastInLumBuf
+
vLumBufSize
;
const
int16_t
**
lumSrcPtr
=
(
const
int16_t
**
)
lumPixBuf
+
lumBufIndex
+
firstLumSrcY
-
lastInLumBuf
+
vLumBufSize
;
const
int16_t
**
chrUSrcPtr
=
(
const
int16_t
**
)
chrUPixBuf
+
chrBufIndex
+
firstChrSrcY
-
lastInChrBuf
+
vChrBufSize
;
const
int16_t
**
chrUSrcPtr
=
(
const
int16_t
**
)
chrUPixBuf
+
chrBufIndex
+
firstChrSrcY
-
lastInChrBuf
+
vChrBufSize
;
const
int16_t
**
alpSrcPtr
=
(
CONFIG_SWSCALE_ALPHA
&&
alpPixBuf
)
?
(
const
int16_t
**
)
alpPixBuf
+
lumBufIndex
+
firstLumSrcY
-
lastInLumBuf
+
vLumBufSize
:
NULL
;
int
i
;
int
i
;
if
(
flags
&
SWS_ACCURATE_RND
)
{
if
(
flags
&
SWS_ACCURATE_RND
)
{
int
s
=
APCK_SIZE
/
8
;
int
s
=
APCK_SIZE
/
8
;
...
@@ -125,12 +122,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
...
@@ -125,12 +122,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
lumMmxFilter
[
s
*
i
+
APCK_COEF
/
4
]
=
lumMmxFilter
[
s
*
i
+
APCK_COEF
/
4
]
=
lumMmxFilter
[
s
*
i
+
APCK_COEF
/
4
+
1
]
=
vLumFilter
[
dstY
*
vLumFilterSize
+
i
]
lumMmxFilter
[
s
*
i
+
APCK_COEF
/
4
+
1
]
=
vLumFilter
[
dstY
*
vLumFilterSize
+
i
]
+
(
vLumFilterSize
>
1
?
vLumFilter
[
dstY
*
vLumFilterSize
+
i
+
1
]
<<
16
:
0
);
+
(
vLumFilterSize
>
1
?
vLumFilter
[
dstY
*
vLumFilterSize
+
i
+
1
]
<<
16
:
0
);
if
(
CONFIG_SWSCALE_ALPHA
&&
alpPixBuf
)
{
*
(
const
void
**
)
&
alpMmxFilter
[
s
*
i
]
=
alpSrcPtr
[
i
];
*
(
const
void
**
)
&
alpMmxFilter
[
s
*
i
+
APCK_PTR2
/
4
]
=
alpSrcPtr
[
i
+
(
vLumFilterSize
>
1
)];
alpMmxFilter
[
s
*
i
+
APCK_COEF
/
4
]
=
alpMmxFilter
[
s
*
i
+
APCK_COEF
/
4
+
1
]
=
lumMmxFilter
[
s
*
i
+
APCK_COEF
/
4
];
}
}
}
for
(
i
=
0
;
i
<
vChrFilterSize
;
i
+=
2
)
{
for
(
i
=
0
;
i
<
vChrFilterSize
;
i
+=
2
)
{
*
(
const
void
**
)
&
chrMmxFilter
[
s
*
i
]
=
chrUSrcPtr
[
i
];
*
(
const
void
**
)
&
chrMmxFilter
[
s
*
i
]
=
chrUSrcPtr
[
i
];
...
@@ -145,11 +136,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
...
@@ -145,11 +136,6 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
lumMmxFilter
[
4
*
i
+
2
]
=
lumMmxFilter
[
4
*
i
+
2
]
=
lumMmxFilter
[
4
*
i
+
3
]
=
lumMmxFilter
[
4
*
i
+
3
]
=
((
uint16_t
)
vLumFilter
[
dstY
*
vLumFilterSize
+
i
])
*
0x10001
;
((
uint16_t
)
vLumFilter
[
dstY
*
vLumFilterSize
+
i
])
*
0x10001
;
if
(
CONFIG_SWSCALE_ALPHA
&&
alpPixBuf
)
{
*
(
const
void
**
)
&
alpMmxFilter
[
4
*
i
+
0
]
=
alpSrcPtr
[
i
];
alpMmxFilter
[
4
*
i
+
2
]
=
alpMmxFilter
[
4
*
i
+
3
]
=
lumMmxFilter
[
4
*
i
+
2
];
}
}
}
for
(
i
=
0
;
i
<
vChrFilterSize
;
i
++
)
{
for
(
i
=
0
;
i
<
vChrFilterSize
;
i
++
)
{
*
(
const
void
**
)
&
chrMmxFilter
[
4
*
i
+
0
]
=
chrUSrcPtr
[
i
];
*
(
const
void
**
)
&
chrMmxFilter
[
4
*
i
+
0
]
=
chrUSrcPtr
[
i
];
...
...
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