Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
068e6cb7
Commit
068e6cb7
authored
Oct 19, 2015
by
Timothy Gu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huffyuvencdsp: Use intptr_t for width
It is done this way in huffyuvdsp as well.
parent
a079cbf4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
huffyuvencdsp.c
libavcodec/huffyuvencdsp.c
+2
-2
huffyuvencdsp.h
libavcodec/huffyuvencdsp.h
+2
-2
huffyuvencdsp_mmx.c
libavcodec/x86/huffyuvencdsp_mmx.c
+3
-2
No files found.
libavcodec/huffyuvencdsp.c
View file @
068e6cb7
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#define pb_7f (~0UL / 255 * 0x7f)
#define pb_7f (~0UL / 255 * 0x7f)
#define pb_80 (~0UL / 255 * 0x80)
#define pb_80 (~0UL / 255 * 0x80)
static
void
diff_bytes_c
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
int
w
)
static
void
diff_bytes_c
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
int
ptr_t
w
)
{
{
long
i
;
long
i
;
...
@@ -54,7 +54,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
...
@@ -54,7 +54,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
}
}
static
void
sub_hfyu_median_pred_c
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
static
void
sub_hfyu_median_pred_c
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
int
w
,
const
uint8_t
*
src2
,
int
ptr_t
w
,
int
*
left
,
int
*
left_top
)
int
*
left
,
int
*
left_top
)
{
{
int
i
;
int
i
;
...
...
libavcodec/huffyuvencdsp.h
View file @
068e6cb7
...
@@ -25,13 +25,13 @@ typedef struct HuffYUVEncDSPContext {
...
@@ -25,13 +25,13 @@ typedef struct HuffYUVEncDSPContext {
void
(
*
diff_bytes
)(
uint8_t
*
dst
/* align 16 */
,
void
(
*
diff_bytes
)(
uint8_t
*
dst
/* align 16 */
,
const
uint8_t
*
src1
/* align 16 */
,
const
uint8_t
*
src1
/* align 16 */
,
const
uint8_t
*
src2
/* align 1 */
,
const
uint8_t
*
src2
/* align 1 */
,
int
w
);
int
ptr_t
w
);
/**
/**
* Subtract HuffYUV's variant of median prediction.
* Subtract HuffYUV's variant of median prediction.
* Note, this might read from src1[-1], src2[-1].
* Note, this might read from src1[-1], src2[-1].
*/
*/
void
(
*
sub_hfyu_median_pred
)(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
void
(
*
sub_hfyu_median_pred
)(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
int
w
,
const
uint8_t
*
src2
,
int
ptr_t
w
,
int
*
left
,
int
*
left_top
);
int
*
left
,
int
*
left_top
);
}
HuffYUVEncDSPContext
;
}
HuffYUVEncDSPContext
;
...
...
libavcodec/x86/huffyuvencdsp_mmx.c
View file @
068e6cb7
...
@@ -31,7 +31,8 @@
...
@@ -31,7 +31,8 @@
#if HAVE_INLINE_ASM
#if HAVE_INLINE_ASM
static
void
diff_bytes_mmx
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
int
w
)
static
void
diff_bytes_mmx
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
intptr_t
w
)
{
{
x86_reg
i
=
0
;
x86_reg
i
=
0
;
...
@@ -57,7 +58,7 @@ static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src
...
@@ -57,7 +58,7 @@ static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src
}
}
static
void
sub_hfyu_median_pred_mmxext
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
static
void
sub_hfyu_median_pred_mmxext
(
uint8_t
*
dst
,
const
uint8_t
*
src1
,
const
uint8_t
*
src2
,
int
w
,
const
uint8_t
*
src2
,
int
ptr_t
w
,
int
*
left
,
int
*
left_top
)
int
*
left
,
int
*
left_top
)
{
{
x86_reg
i
=
0
;
x86_reg
i
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment