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
9a520c4d
Commit
9a520c4d
authored
Oct 02, 2015
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/avf_showspectrum: remove looping on request_frame().
parent
114f3f52
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
avf_showspectrum.c
libavfilter/avf_showspectrum.c
+1
-6
No files found.
libavfilter/avf_showspectrum.c
View file @
9a520c4d
...
@@ -44,7 +44,6 @@ typedef struct {
...
@@ -44,7 +44,6 @@ typedef struct {
const
AVClass
*
class
;
const
AVClass
*
class
;
int
w
,
h
;
int
w
,
h
;
AVFrame
*
outpicref
;
AVFrame
*
outpicref
;
int
req_fullfilled
;
int
nb_display_channels
;
int
nb_display_channels
;
int
channel_height
;
int
channel_height
;
int
sliding
;
///< 1 if sliding mode, 0 otherwise
int
sliding
;
///< 1 if sliding mode, 0 otherwise
...
@@ -268,8 +267,7 @@ static int request_frame(AVFilterLink *outlink)
...
@@ -268,8 +267,7 @@ static int request_frame(AVFilterLink *outlink)
unsigned
i
;
unsigned
i
;
int
ret
;
int
ret
;
s
->
req_fullfilled
=
0
;
/* TODO reindent */
do
{
ret
=
ff_request_frame
(
inlink
);
ret
=
ff_request_frame
(
inlink
);
if
(
ret
==
AVERROR_EOF
&&
s
->
sliding
==
FULLFRAME
&&
s
->
xpos
>
0
&&
if
(
ret
==
AVERROR_EOF
&&
s
->
sliding
==
FULLFRAME
&&
s
->
xpos
>
0
&&
s
->
outpicref
)
{
s
->
outpicref
)
{
...
@@ -280,9 +278,7 @@ static int request_frame(AVFilterLink *outlink)
...
@@ -280,9 +278,7 @@ static int request_frame(AVFilterLink *outlink)
}
}
ret
=
ff_filter_frame
(
outlink
,
s
->
outpicref
);
ret
=
ff_filter_frame
(
outlink
,
s
->
outpicref
);
s
->
outpicref
=
NULL
;
s
->
outpicref
=
NULL
;
s
->
req_fullfilled
=
1
;
}
}
}
while
(
!
s
->
req_fullfilled
&&
ret
>=
0
);
return
ret
;
return
ret
;
}
}
...
@@ -468,7 +464,6 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples)
...
@@ -468,7 +464,6 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples)
if
(
s
->
xpos
>=
outlink
->
w
)
if
(
s
->
xpos
>=
outlink
->
w
)
s
->
xpos
=
0
;
s
->
xpos
=
0
;
if
(
s
->
sliding
!=
FULLFRAME
||
s
->
xpos
==
0
)
{
if
(
s
->
sliding
!=
FULLFRAME
||
s
->
xpos
==
0
)
{
s
->
req_fullfilled
=
1
;
ret
=
ff_filter_frame
(
outlink
,
av_frame_clone
(
s
->
outpicref
));
ret
=
ff_filter_frame
(
outlink
,
av_frame_clone
(
s
->
outpicref
));
if
(
ret
<
0
)
if
(
ret
<
0
)
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