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
422e14f7
Commit
422e14f7
authored
Jun 25, 2014
by
Kostya Shishkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
indeo2: rename stride to pitch for consistency with other Indeo decoders
parent
a5864e9a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
indeo2.c
libavcodec/indeo2.c
+8
-8
No files found.
libavcodec/indeo2.c
View file @
422e14f7
...
@@ -49,7 +49,7 @@ static inline int ir2_get_code(GetBitContext *gb)
...
@@ -49,7 +49,7 @@ static inline int ir2_get_code(GetBitContext *gb)
}
}
static
int
ir2_decode_plane
(
Ir2Context
*
ctx
,
int
width
,
int
height
,
uint8_t
*
dst
,
static
int
ir2_decode_plane
(
Ir2Context
*
ctx
,
int
width
,
int
height
,
uint8_t
*
dst
,
int
stride
,
const
uint8_t
*
table
)
int
pitch
,
const
uint8_t
*
table
)
{
{
int
i
;
int
i
;
int
j
;
int
j
;
...
@@ -74,7 +74,7 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
...
@@ -74,7 +74,7 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
dst
[
out
++
]
=
table
[(
c
*
2
)
+
1
];
dst
[
out
++
]
=
table
[(
c
*
2
)
+
1
];
}
}
}
}
dst
+=
stride
;
dst
+=
pitch
;
for
(
j
=
1
;
j
<
height
;
j
++
)
{
for
(
j
=
1
;
j
<
height
;
j
++
)
{
out
=
0
;
out
=
0
;
...
@@ -85,27 +85,27 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
...
@@ -85,27 +85,27 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
if
(
out
+
c
*
2
>
width
)
if
(
out
+
c
*
2
>
width
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
for
(
i
=
0
;
i
<
c
*
2
;
i
++
)
{
for
(
i
=
0
;
i
<
c
*
2
;
i
++
)
{
dst
[
out
]
=
dst
[
out
-
stride
];
dst
[
out
]
=
dst
[
out
-
pitch
];
out
++
;
out
++
;
}
}
}
else
{
/* add two deltas from table */
}
else
{
/* add two deltas from table */
t
=
dst
[
out
-
stride
]
+
(
table
[
c
*
2
]
-
128
);
t
=
dst
[
out
-
pitch
]
+
(
table
[
c
*
2
]
-
128
);
t
=
av_clip_uint8
(
t
);
t
=
av_clip_uint8
(
t
);
dst
[
out
]
=
t
;
dst
[
out
]
=
t
;
out
++
;
out
++
;
t
=
dst
[
out
-
stride
]
+
(
table
[(
c
*
2
)
+
1
]
-
128
);
t
=
dst
[
out
-
pitch
]
+
(
table
[(
c
*
2
)
+
1
]
-
128
);
t
=
av_clip_uint8
(
t
);
t
=
av_clip_uint8
(
t
);
dst
[
out
]
=
t
;
dst
[
out
]
=
t
;
out
++
;
out
++
;
}
}
}
}
dst
+=
stride
;
dst
+=
pitch
;
}
}
return
0
;
return
0
;
}
}
static
int
ir2_decode_plane_inter
(
Ir2Context
*
ctx
,
int
width
,
int
height
,
uint8_t
*
dst
,
static
int
ir2_decode_plane_inter
(
Ir2Context
*
ctx
,
int
width
,
int
height
,
uint8_t
*
dst
,
int
stride
,
const
uint8_t
*
table
)
int
pitch
,
const
uint8_t
*
table
)
{
{
int
j
;
int
j
;
int
out
=
0
;
int
out
=
0
;
...
@@ -133,7 +133,7 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_
...
@@ -133,7 +133,7 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_
out
++
;
out
++
;
}
}
}
}
dst
+=
stride
;
dst
+=
pitch
;
}
}
return
0
;
return
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