Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
696141e8
Commit
696141e8
authored
Dec 02, 2014
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vf_interlace: use image width rather than linesize
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
parent
fe082998
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
vf_interlace.c
libavfilter/vf_interlace.c
+5
-4
No files found.
libavfilter/vf_interlace.c
View file @
696141e8
...
@@ -131,16 +131,17 @@ static void copy_picture_field(InterlaceContext *s,
...
@@ -131,16 +131,17 @@ static void copy_picture_field(InterlaceContext *s,
int
lowpass
)
int
lowpass
)
{
{
const
AVPixFmtDescriptor
*
desc
=
av_pix_fmt_desc_get
(
inlink
->
format
);
const
AVPixFmtDescriptor
*
desc
=
av_pix_fmt_desc_get
(
inlink
->
format
);
int
hsub
=
desc
->
log2_chroma_w
;
int
vsub
=
desc
->
log2_chroma_h
;
int
vsub
=
desc
->
log2_chroma_h
;
int
plane
,
j
;
int
plane
,
j
;
for
(
plane
=
0
;
plane
<
desc
->
nb_components
;
plane
++
)
{
for
(
plane
=
0
;
plane
<
desc
->
nb_components
;
plane
++
)
{
int
cols
=
(
plane
==
1
||
plane
==
2
)
?
-
(
-
inlink
->
w
)
>>
hsub
:
inlink
->
w
;
int
lines
=
(
plane
==
1
||
plane
==
2
)
?
-
(
-
inlink
->
h
)
>>
vsub
:
inlink
->
h
;
int
lines
=
(
plane
==
1
||
plane
==
2
)
?
-
(
-
inlink
->
h
)
>>
vsub
:
inlink
->
h
;
ptrdiff_t
linesize
=
av_image_get_linesize
(
inlink
->
format
,
inlink
->
w
,
plane
);
uint8_t
*
dstp
=
dst_frame
->
data
[
plane
];
uint8_t
*
dstp
=
dst_frame
->
data
[
plane
];
const
uint8_t
*
srcp
=
src_frame
->
data
[
plane
];
const
uint8_t
*
srcp
=
src_frame
->
data
[
plane
];
av_assert0
(
linesize
>=
0
);
av_assert0
(
cols
>=
0
);
lines
=
(
lines
+
(
field_type
==
FIELD_UPPER
))
/
2
;
lines
=
(
lines
+
(
field_type
==
FIELD_UPPER
))
/
2
;
if
(
field_type
==
FIELD_LOWER
)
if
(
field_type
==
FIELD_LOWER
)
...
@@ -157,14 +158,14 @@ static void copy_picture_field(InterlaceContext *s,
...
@@ -157,14 +158,14 @@ static void copy_picture_field(InterlaceContext *s,
srcp_above
=
srcp
;
// there is no line above
srcp_above
=
srcp
;
// there is no line above
if
(
j
==
1
)
if
(
j
==
1
)
srcp_below
=
srcp
;
// there is no line below
srcp_below
=
srcp
;
// there is no line below
s
->
lowpass_line
(
dstp
,
linesize
,
srcp
,
srcp_above
,
srcp_below
);
s
->
lowpass_line
(
dstp
,
cols
,
srcp
,
srcp_above
,
srcp_below
);
dstp
+=
dstp_linesize
;
dstp
+=
dstp_linesize
;
srcp
+=
srcp_linesize
;
srcp
+=
srcp_linesize
;
}
}
}
else
{
}
else
{
av_image_copy_plane
(
dstp
,
dst_frame
->
linesize
[
plane
]
*
2
,
av_image_copy_plane
(
dstp
,
dst_frame
->
linesize
[
plane
]
*
2
,
srcp
,
src_frame
->
linesize
[
plane
]
*
2
,
srcp
,
src_frame
->
linesize
[
plane
]
*
2
,
linesize
,
lines
);
cols
,
lines
);
}
}
}
}
}
}
...
...
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