Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
e735b576
Commit
e735b576
authored
Aug 25, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Aug 25, 2014
Browse files
Merge "Removing non-executable code from encoder_encode()."
parents
05869759
3efb0363
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/vp9_cx_iface.c
View file @
e735b576
...
...
@@ -912,7 +912,7 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx,
#endif
// Pack invisible frames with the next visible frame
if
(
cpi
->
common
.
show_frame
==
0
if
(
!
cpi
->
common
.
show_frame
#if CONFIG_SPATIAL_SVC
||
(
is_spatial_svc
(
cpi
)
&&
cpi
->
svc
.
spatial_layer_id
<
cpi
->
svc
.
number_spatial_layers
-
1
)
...
...
@@ -944,18 +944,6 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx,
)
pkt
.
data
.
frame
.
flags
|=
VPX_FRAME_IS_KEY
;
if
(
cpi
->
common
.
show_frame
==
0
)
{
pkt
.
data
.
frame
.
flags
|=
VPX_FRAME_IS_INVISIBLE
;
// This timestamp should be as close as possible to the
// prior PTS so that if a decoder uses pts to schedule when
// to do this, we start right after last frame was decoded.
// Invisible frames have no duration.
pkt
.
data
.
frame
.
pts
=
ticks_to_timebase_units
(
timebase
,
cpi
->
last_time_stamp_seen
)
+
1
;
pkt
.
data
.
frame
.
duration
=
0
;
}
if
(
cpi
->
droppable
)
pkt
.
data
.
frame
.
flags
|=
VPX_FRAME_IS_DROPPABLE
;
...
...
Write
Preview
Supports
Markdown
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