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
9651239f
Commit
9651239f
authored
Jan 24, 2014
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: use intermediary variables in reap_filters, increase readability
parent
68c5ba1f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
ffmpeg.c
ffmpeg.c
+11
-12
No files found.
ffmpeg.c
View file @
9651239f
...
...
@@ -1084,10 +1084,13 @@ static int reap_filters(void)
for
(
i
=
0
;
i
<
nb_output_streams
;
i
++
)
{
OutputStream
*
ost
=
output_streams
[
i
];
OutputFile
*
of
=
output_files
[
ost
->
file_index
];
AVFilterContext
*
filter
;
AVCodecContext
*
enc
=
ost
->
st
->
codec
;
int
ret
=
0
;
if
(
!
ost
->
filter
)
continue
;
filter
=
ost
->
filter
->
filter
;
if
(
!
ost
->
filtered_frame
&&
!
(
ost
->
filtered_frame
=
av_frame_alloc
()))
{
return
AVERROR
(
ENOMEM
);
...
...
@@ -1095,7 +1098,7 @@ static int reap_filters(void)
filtered_frame
=
ost
->
filtered_frame
;
while
(
1
)
{
ret
=
av_buffersink_get_frame_flags
(
ost
->
filter
->
filter
,
filtered_frame
,
ret
=
av_buffersink_get_frame_flags
(
filter
,
filtered_frame
,
AV_BUFFERSINK_FLAG_NO_REQUEST
);
if
(
ret
<
0
)
{
if
(
ret
!=
AVERROR
(
EAGAIN
)
&&
ret
!=
AVERROR_EOF
)
{
...
...
@@ -1111,29 +1114,25 @@ static int reap_filters(void)
frame_pts
=
AV_NOPTS_VALUE
;
if
(
filtered_frame
->
pts
!=
AV_NOPTS_VALUE
)
{
int64_t
start_time
=
(
of
->
start_time
==
AV_NOPTS_VALUE
)
?
0
:
of
->
start_time
;
filtered_frame
->
pts
=
frame_pts
=
av_rescale_q
(
filtered_frame
->
pts
,
ost
->
filter
->
filter
->
inputs
[
0
]
->
time_base
,
ost
->
st
->
codec
->
time_base
)
-
av_rescale_q
(
start_time
,
AV_TIME_BASE_Q
,
ost
->
st
->
codec
->
time_base
);
filtered_frame
->
pts
=
frame_pts
=
av_rescale_q
(
filtered_frame
->
pts
,
filter
->
inputs
[
0
]
->
time_base
,
enc
->
time_base
)
-
av_rescale_q
(
start_time
,
AV_TIME_BASE_Q
,
enc
->
time_base
);
}
//if (ost->source_index >= 0)
// *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
switch
(
ost
->
filter
->
filter
->
inputs
[
0
]
->
type
)
{
switch
(
filter
->
inputs
[
0
]
->
type
)
{
case
AVMEDIA_TYPE_VIDEO
:
filtered_frame
->
pts
=
frame_pts
;
if
(
!
ost
->
frame_aspect_ratio
.
num
)
ost
->
st
->
code
c
->
sample_aspect_ratio
=
filtered_frame
->
sample_aspect_ratio
;
en
c
->
sample_aspect_ratio
=
filtered_frame
->
sample_aspect_ratio
;
do_video_out
(
of
->
ctx
,
ost
,
filtered_frame
);
break
;
case
AVMEDIA_TYPE_AUDIO
:
filtered_frame
->
pts
=
frame_pts
;
if
(
!
(
ost
->
st
->
code
c
->
codec
->
capabilities
&
CODEC_CAP_PARAM_CHANGE
)
&&
ost
->
st
->
code
c
->
channels
!=
av_frame_get_channels
(
filtered_frame
))
{
if
(
!
(
en
c
->
codec
->
capabilities
&
CODEC_CAP_PARAM_CHANGE
)
&&
en
c
->
channels
!=
av_frame_get_channels
(
filtered_frame
))
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"Audio filter graph output is not normalized and encoder does not support parameter changes
\n
"
);
break
;
...
...
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