Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
918c3c11
Commit
918c3c11
authored
Jun 19, 2017
by
Sebastien Alaiwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename 'size' to 'frame_size'
Change-Id: Ie720d1befcfe3c77db56bd3313b6e920fd69945c
parent
62fc41ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
av1/av1_cx_iface.c
av1/av1_cx_iface.c
+13
-13
No files found.
av1/av1_cx_iface.c
View file @
918c3c11
...
...
@@ -1213,10 +1213,10 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
}
}
size_t
size
;
size_t
frame_
size
;
unsigned
int
lib_flags
=
0
;
while
(
cx_data_sz
>=
ctx
->
cx_data_sz
/
2
&&
-
1
!=
av1_get_compressed_data
(
cpi
,
&
lib_flags
,
&
size
,
cx_data
,
-
1
!=
av1_get_compressed_data
(
cpi
,
&
lib_flags
,
&
frame_
size
,
cx_data
,
&
dst_time_stamp
,
&
dst_end_time_stamp
,
!
img
))
{
#if CONFIG_REFERENCE_BUFFER
...
...
@@ -1225,14 +1225,14 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
return
AOM_CODEC_ERROR
;
}
#endif
if
(
size
)
{
if
(
frame_
size
)
{
// Pack invisible frames with the next visible frame
if
(
!
cpi
->
common
.
show_frame
)
{
if
(
ctx
->
pending_cx_data
==
0
)
ctx
->
pending_cx_data
=
cx_data
;
ctx
->
pending_cx_data_sz
+=
size
;
ctx
->
pending_frame_sizes
[
ctx
->
pending_frame_count
++
]
=
size
;
cx_data
+=
size
;
cx_data_sz
-=
size
;
ctx
->
pending_cx_data_sz
+=
frame_
size
;
ctx
->
pending_frame_sizes
[
ctx
->
pending_frame_count
++
]
=
frame_
size
;
cx_data
+=
frame_
size
;
cx_data_sz
-=
frame_
size
;
continue
;
}
...
...
@@ -1247,9 +1247,9 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
pkt
.
data
.
frame
.
flags
=
get_frame_pkt_flags
(
cpi
,
lib_flags
);
if
(
ctx
->
pending_cx_data
)
{
ctx
->
pending_frame_sizes
[
ctx
->
pending_frame_count
++
]
=
size
;
ctx
->
pending_cx_data_sz
+=
size
;
size
+=
write_superframe_index
(
ctx
);
ctx
->
pending_frame_sizes
[
ctx
->
pending_frame_count
++
]
=
frame_
size
;
ctx
->
pending_cx_data_sz
+=
frame_
size
;
frame_
size
+=
write_superframe_index
(
ctx
);
pkt
.
data
.
frame
.
buf
=
ctx
->
pending_cx_data
;
pkt
.
data
.
frame
.
sz
=
ctx
->
pending_cx_data_sz
;
ctx
->
pending_cx_data
=
NULL
;
...
...
@@ -1257,14 +1257,14 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
ctx
->
pending_frame_count
=
0
;
}
else
{
pkt
.
data
.
frame
.
buf
=
cx_data
;
pkt
.
data
.
frame
.
sz
=
size
;
pkt
.
data
.
frame
.
sz
=
frame_
size
;
}
pkt
.
data
.
frame
.
partition_id
=
-
1
;
aom_codec_pkt_list_add
(
&
ctx
->
pkt_list
.
head
,
&
pkt
);
cx_data
+=
size
;
cx_data_sz
-=
size
;
cx_data
+=
frame_
size
;
cx_data_sz
-=
frame_
size
;
}
}
}
...
...
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