Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
24fea4d0
Commit
24fea4d0
authored
Jul 11, 2020
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_tinterlace: use frame counter from lavfi
Remove internal counter.
parent
fe591393
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
tinterlace.h
libavfilter/tinterlace.h
+0
-1
vf_tinterlace.c
libavfilter/vf_tinterlace.c
+1
-2
No files found.
libavfilter/tinterlace.h
View file @
24fea4d0
...
@@ -67,7 +67,6 @@ typedef struct TInterlaceContext {
...
@@ -67,7 +67,6 @@ typedef struct TInterlaceContext {
AVRational
preout_time_base
;
AVRational
preout_time_base
;
int
flags
;
///< flags affecting interlacing algorithm
int
flags
;
///< flags affecting interlacing algorithm
int
lowpass
;
///< legacy interlace filter lowpass mode
int
lowpass
;
///< legacy interlace filter lowpass mode
int
frame
;
///< number of the output frame
int
vsub
;
///< chroma vertical subsampling
int
vsub
;
///< chroma vertical subsampling
AVFrame
*
cur
;
AVFrame
*
cur
;
AVFrame
*
next
;
AVFrame
*
next
;
...
...
libavfilter/vf_tinterlace.c
View file @
24fea4d0
...
@@ -423,7 +423,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
...
@@ -423,7 +423,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
out
->
height
=
outlink
->
h
;
out
->
height
=
outlink
->
h
;
out
->
sample_aspect_ratio
=
av_mul_q
(
cur
->
sample_aspect_ratio
,
av_make_q
(
2
,
1
));
out
->
sample_aspect_ratio
=
av_mul_q
(
cur
->
sample_aspect_ratio
,
av_make_q
(
2
,
1
));
field
=
(
1
+
tinterlace
->
frame
)
&
1
?
FIELD_UPPER
:
FIELD_LOWER
;
field
=
(
1
+
outlink
->
frame_count_in
)
&
1
?
FIELD_UPPER
:
FIELD_LOWER
;
/* copy upper and lower fields */
/* copy upper and lower fields */
copy_picture_field
(
tinterlace
,
out
->
data
,
out
->
linesize
,
copy_picture_field
(
tinterlace
,
out
->
data
,
out
->
linesize
,
(
const
uint8_t
**
)
cur
->
data
,
cur
->
linesize
,
(
const
uint8_t
**
)
cur
->
data
,
cur
->
linesize
,
...
@@ -517,7 +517,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
...
@@ -517,7 +517,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
out
->
pts
=
av_rescale_q
(
out
->
pts
,
tinterlace
->
preout_time_base
,
outlink
->
time_base
);
out
->
pts
=
av_rescale_q
(
out
->
pts
,
tinterlace
->
preout_time_base
,
outlink
->
time_base
);
ret
=
ff_filter_frame
(
outlink
,
out
);
ret
=
ff_filter_frame
(
outlink
,
out
);
tinterlace
->
frame
++
;
return
ret
;
return
ret
;
}
}
...
...
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