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
6eb6956d
Commit
6eb6956d
authored
Apr 03, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: Fix indentation
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
98c7729c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
66 additions
and
66 deletions
+66
-66
ffmpeg.c
ffmpeg.c
+66
-66
No files found.
ffmpeg.c
View file @
6eb6956d
...
@@ -921,77 +921,77 @@ static void do_video_out(AVFormatContext *s,
...
@@ -921,77 +921,77 @@ static void do_video_out(AVFormatContext *s,
ost
->
last_nb0_frames
[
1
],
ost
->
last_nb0_frames
[
1
],
ost
->
last_nb0_frames
[
2
]);
ost
->
last_nb0_frames
[
2
]);
}
else
{
}
else
{
delta0
=
sync_ipts
-
ost
->
sync_opts
;
delta0
=
sync_ipts
-
ost
->
sync_opts
;
delta
=
delta0
+
duration
;
delta
=
delta0
+
duration
;
/* by default, we output a single frame */
/* by default, we output a single frame */
nb0_frames
=
0
;
nb0_frames
=
0
;
nb_frames
=
1
;
nb_frames
=
1
;
format_video_sync
=
video_sync_method
;
format_video_sync
=
video_sync_method
;
if
(
format_video_sync
==
VSYNC_AUTO
)
{
if
(
format_video_sync
==
VSYNC_AUTO
)
{
if
(
!
strcmp
(
s
->
oformat
->
name
,
"avi"
))
{
if
(
!
strcmp
(
s
->
oformat
->
name
,
"avi"
))
{
format_video_sync
=
VSYNC_VFR
;
format_video_sync
=
VSYNC_VFR
;
}
else
}
else
format_video_sync
=
(
s
->
oformat
->
flags
&
AVFMT_VARIABLE_FPS
)
?
((
s
->
oformat
->
flags
&
AVFMT_NOTIMESTAMPS
)
?
VSYNC_PASSTHROUGH
:
VSYNC_VFR
)
:
VSYNC_CFR
;
format_video_sync
=
(
s
->
oformat
->
flags
&
AVFMT_VARIABLE_FPS
)
?
((
s
->
oformat
->
flags
&
AVFMT_NOTIMESTAMPS
)
?
VSYNC_PASSTHROUGH
:
VSYNC_VFR
)
:
VSYNC_CFR
;
if
(
ist
if
(
ist
&&
format_video_sync
==
VSYNC_CFR
&&
format_video_sync
==
VSYNC_CFR
&&
input_files
[
ist
->
file_index
]
->
ctx
->
nb_streams
==
1
&&
input_files
[
ist
->
file_index
]
->
ctx
->
nb_streams
==
1
&&
input_files
[
ist
->
file_index
]
->
input_ts_offset
==
0
)
{
&&
input_files
[
ist
->
file_index
]
->
input_ts_offset
==
0
)
{
format_video_sync
=
VSYNC_VSCFR
;
format_video_sync
=
VSYNC_VSCFR
;
}
}
if
(
format_video_sync
==
VSYNC_CFR
&&
copy_ts
)
{
if
(
format_video_sync
==
VSYNC_CFR
&&
copy_ts
)
{
format_video_sync
=
VSYNC_VSCFR
;
format_video_sync
=
VSYNC_VSCFR
;
}
}
}
}
if
(
delta0
<
0
&&
if
(
delta0
<
0
&&
delta
>
0
&&
delta
>
0
&&
format_video_sync
!=
VSYNC_PASSTHROUGH
&&
format_video_sync
!=
VSYNC_PASSTHROUGH
&&
format_video_sync
!=
VSYNC_DROP
)
{
format_video_sync
!=
VSYNC_DROP
)
{
double
cor
=
FFMIN
(
-
delta0
,
duration
);
double
cor
=
FFMIN
(
-
delta0
,
duration
);
if
(
delta0
<
-
0
.
6
)
{
if
(
delta0
<
-
0
.
6
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"Past duration %f too large
\n
"
,
-
delta0
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"Past duration %f too large
\n
"
,
-
delta0
);
}
else
}
else
av_log
(
NULL
,
AV_LOG_DEBUG
,
"Cliping frame in rate conversion by %f
\n
"
,
-
delta0
);
av_log
(
NULL
,
AV_LOG_DEBUG
,
"Cliping frame in rate conversion by %f
\n
"
,
-
delta0
);
sync_ipts
+=
cor
;
sync_ipts
+=
cor
;
duration
-=
cor
;
duration
-=
cor
;
delta0
+=
cor
;
delta0
+=
cor
;
}
}
switch
(
format_video_sync
)
{
switch
(
format_video_sync
)
{
case
VSYNC_VSCFR
:
case
VSYNC_VSCFR
:
if
(
ost
->
frame_number
==
0
&&
delta
-
duration
>=
0
.
5
)
{
if
(
ost
->
frame_number
==
0
&&
delta
-
duration
>=
0
.
5
)
{
av_log
(
NULL
,
AV_LOG_DEBUG
,
"Not duplicating %d initial frames
\n
"
,
(
int
)
lrintf
(
delta
-
duration
));
av_log
(
NULL
,
AV_LOG_DEBUG
,
"Not duplicating %d initial frames
\n
"
,
(
int
)
lrintf
(
delta
-
duration
));
delta
=
duration
;
delta
=
duration
;
delta0
=
0
;
delta0
=
0
;
ost
->
sync_opts
=
lrint
(
sync_ipts
);
}
case
VSYNC_CFR
:
// FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
if
(
frame_drop_threshold
&&
delta
<
frame_drop_threshold
&&
ost
->
frame_number
)
{
nb_frames
=
0
;
}
else
if
(
delta
<
-
1
.
1
)
nb_frames
=
0
;
else
if
(
delta
>
1
.
1
)
{
nb_frames
=
lrintf
(
delta
);
if
(
delta0
>
1
.
1
)
nb0_frames
=
lrintf
(
delta0
-
0
.
6
);
}
break
;
case
VSYNC_VFR
:
if
(
delta
<=
-
0
.
6
)
nb_frames
=
0
;
else
if
(
delta
>
0
.
6
)
ost
->
sync_opts
=
lrint
(
sync_ipts
);
break
;
case
VSYNC_DROP
:
case
VSYNC_PASSTHROUGH
:
ost
->
sync_opts
=
lrint
(
sync_ipts
);
ost
->
sync_opts
=
lrint
(
sync_ipts
);
break
;
default:
av_assert0
(
0
);
}
}
case
VSYNC_CFR
:
// FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
if
(
frame_drop_threshold
&&
delta
<
frame_drop_threshold
&&
ost
->
frame_number
)
{
nb_frames
=
0
;
}
else
if
(
delta
<
-
1
.
1
)
nb_frames
=
0
;
else
if
(
delta
>
1
.
1
)
{
nb_frames
=
lrintf
(
delta
);
if
(
delta0
>
1
.
1
)
nb0_frames
=
lrintf
(
delta0
-
0
.
6
);
}
break
;
case
VSYNC_VFR
:
if
(
delta
<=
-
0
.
6
)
nb_frames
=
0
;
else
if
(
delta
>
0
.
6
)
ost
->
sync_opts
=
lrint
(
sync_ipts
);
break
;
case
VSYNC_DROP
:
case
VSYNC_PASSTHROUGH
:
ost
->
sync_opts
=
lrint
(
sync_ipts
);
break
;
default:
av_assert0
(
0
);
}
}
}
nb_frames
=
FFMIN
(
nb_frames
,
ost
->
max_frames
-
ost
->
frame_number
);
nb_frames
=
FFMIN
(
nb_frames
,
ost
->
max_frames
-
ost
->
frame_number
);
...
@@ -1171,7 +1171,7 @@ static void do_video_out(AVFormatContext *s,
...
@@ -1171,7 +1171,7 @@ static void do_video_out(AVFormatContext *s,
ost
->
last_frame
=
av_frame_alloc
();
ost
->
last_frame
=
av_frame_alloc
();
av_frame_unref
(
ost
->
last_frame
);
av_frame_unref
(
ost
->
last_frame
);
if
(
next_picture
)
if
(
next_picture
)
av_frame_ref
(
ost
->
last_frame
,
next_picture
);
av_frame_ref
(
ost
->
last_frame
,
next_picture
);
}
}
static
double
psnr
(
double
d
)
static
double
psnr
(
double
d
)
...
...
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