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
2a19c9e3
Commit
2a19c9e3
authored
Jun 19, 2017
by
Sebastien Alaiwan
Browse files
Don't silently fail writing the superframe index
Change-Id: I233787c43d200d5648cbaac9887298870097818f
parent
4a81001b
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/av1_cx_iface.c
View file @
2a19c9e3
...
...
@@ -1040,38 +1040,38 @@ static int write_superframe_index(aom_codec_alg_priv_t *ctx) {
// Write the index
const
int
index_sz
=
2
+
(
mag
+
1
)
*
(
ctx
->
pending_frame_count
-
1
);
if
(
ctx
->
pending_cx_data_sz
+
index_sz
<
ctx
->
cx_data_sz
)
{
uint8_t
*
x
=
ctx
->
pending_cx_data
+
ctx
->
pending_cx_data_sz
;
assert
(
ctx
->
pending_cx_data_sz
+
index_sz
<
ctx
->
cx_data_sz
);
uint8_t
*
x
=
ctx
->
pending_cx_data
+
ctx
->
pending_cx_data_sz
;
#ifdef TEST_SUPPLEMENTAL_SUPERFRAME_DATA
uint8_t
marker_test
=
0xc0
;
int
mag_test
=
2
;
// 1 - 4
int
frames_test
=
4
;
// 1 - 8
int
index_sz_test
=
2
+
mag_test
*
frames_test
;
marker_test
|=
frames_test
-
1
;
marker_test
|=
(
mag_test
-
1
)
<<
3
;
*
x
++
=
marker_test
;
for
(
int
i
=
0
;
i
<
mag_test
*
frames_test
;
++
i
)
*
x
++
=
0
;
// fill up with arbitrary data
*
x
++
=
marker_test
;
ctx
->
pending_cx_data_sz
+=
index_sz_test
;
printf
(
"Added supplemental superframe data
\n
"
);
uint8_t
marker_test
=
0xc0
;
int
mag_test
=
2
;
// 1 - 4
int
frames_test
=
4
;
// 1 - 8
int
index_sz_test
=
2
+
mag_test
*
frames_test
;
marker_test
|=
frames_test
-
1
;
marker_test
|=
(
mag_test
-
1
)
<<
3
;
*
x
++
=
marker_test
;
for
(
int
i
=
0
;
i
<
mag_test
*
frames_test
;
++
i
)
*
x
++
=
0
;
// fill up with arbitrary data
*
x
++
=
marker_test
;
ctx
->
pending_cx_data_sz
+=
index_sz_test
;
printf
(
"Added supplemental superframe data
\n
"
);
#endif
*
x
++
=
marker
;
for
(
int
i
=
0
;
i
<
ctx
->
pending_frame_count
-
1
;
i
++
)
{
assert
(
ctx
->
pending_frame_sizes
[
i
]
>
0
);
unsigned
int
this_sz
=
(
unsigned
int
)
ctx
->
pending_frame_sizes
[
i
]
-
1
;
for
(
int
j
=
0
;
j
<=
mag
;
j
++
)
{
*
x
++
=
this_sz
&
0xff
;
this_sz
>>=
8
;
}
*
x
++
=
marker
;
for
(
int
i
=
0
;
i
<
ctx
->
pending_frame_count
-
1
;
i
++
)
{
assert
(
ctx
->
pending_frame_sizes
[
i
]
>
0
);
unsigned
int
this_sz
=
(
unsigned
int
)
ctx
->
pending_frame_sizes
[
i
]
-
1
;
for
(
int
j
=
0
;
j
<=
mag
;
j
++
)
{
*
x
++
=
this_sz
&
0xff
;
this_sz
>>=
8
;
}
*
x
++
=
marker
;
ctx
->
pending_cx_data_sz
+=
index_sz
;
}
*
x
++
=
marker
;
ctx
->
pending_cx_data_sz
+=
index_sz
;
#ifdef TEST_SUPPLEMENTAL_SUPERFRAME_DATA
index_sz
+=
index_sz_test
;
index_sz
+=
index_sz_test
;
#endif
}
return
index_sz
;
}
...
...
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