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
016bc2e7
Commit
016bc2e7
authored
Mar 21, 2014
by
Dmitry Kovalev
Browse files
Removing output_partition from vp9.
Change-Id: I5e0c558b86cf300722ab34fa45ab4ad7c81bd4df
parent
e0c21264
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_onyx_int.h
View file @
016bc2e7
...
...
@@ -774,7 +774,6 @@ typedef struct VP9_COMP {
unsigned
int
activity_avg
;
unsigned
int
*
mb_activity_map
;
int
*
mb_norm_activity_map
;
int
output_partition
;
// Force next frame to intra when kf_auto says so.
int
force_next_frame_intra
;
...
...
vp9/vp9_cx_iface.c
View file @
016bc2e7
...
...
@@ -803,48 +803,25 @@ static vpx_codec_err_t vp9e_encode(vpx_codec_alg_priv_t *ctx,
if
(
cpi
->
droppable
)
pkt
.
data
.
frame
.
flags
|=
VPX_FRAME_IS_DROPPABLE
;
/*if (cpi->output_partition)
{
int i;
const int num_partitions = 1;
pkt.data.frame.flags |= VPX_FRAME_IS_FRAGMENT;
for (i = 0; i < num_partitions; ++i)
{
pkt.data.frame.buf = cx_data;
pkt.data.frame.sz = cpi->partition_sz[i];
pkt.data.frame.partition_id = i;
// don't set the fragment bit for the last partition
if (i == (num_partitions - 1))
pkt.data.frame.flags &= ~VPX_FRAME_IS_FRAGMENT;
vpx_codec_pkt_list_add(&ctx->pkt_list.head, &pkt);
cx_data += cpi->partition_sz[i];
cx_data_sz -= cpi->partition_sz[i];
}
}
else*/
{
if
(
ctx
->
pending_cx_data
)
{
ctx
->
pending_frame_sizes
[
ctx
->
pending_frame_count
++
]
=
size
;
ctx
->
pending_frame_magnitude
|=
size
;
ctx
->
pending_cx_data_sz
+=
size
;
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
;
ctx
->
pending_cx_data_sz
=
0
;
ctx
->
pending_frame_count
=
0
;
ctx
->
pending_frame_magnitude
=
0
;
}
else
{
pkt
.
data
.
frame
.
buf
=
cx_data
;
pkt
.
data
.
frame
.
sz
=
size
;
}
pkt
.
data
.
frame
.
partition_id
=
-
1
;
vpx_codec_pkt_list_add
(
&
ctx
->
pkt_list
.
head
,
&
pkt
);
cx_data
+=
size
;
cx_data_sz
-=
size
;
if
(
ctx
->
pending_cx_data
)
{
ctx
->
pending_frame_sizes
[
ctx
->
pending_frame_count
++
]
=
size
;
ctx
->
pending_frame_magnitude
|=
size
;
ctx
->
pending_cx_data_sz
+=
size
;
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
;
ctx
->
pending_cx_data_sz
=
0
;
ctx
->
pending_frame_count
=
0
;
ctx
->
pending_frame_magnitude
=
0
;
}
else
{
pkt
.
data
.
frame
.
buf
=
cx_data
;
pkt
.
data
.
frame
.
sz
=
size
;
}
pkt
.
data
.
frame
.
partition_id
=
-
1
;
vpx_codec_pkt_list_add
(
&
ctx
->
pkt_list
.
head
,
&
pkt
);
cx_data
+=
size
;
cx_data_sz
-=
size
;
}
}
}
...
...
@@ -1172,8 +1149,7 @@ static vpx_codec_enc_cfg_map_t vp9e_usage_cfg_map[] = {
CODEC_INTERFACE
(
vpx_codec_vp9_cx
)
=
{
"WebM Project VP9 Encoder"
VERSION_STRING
,
VPX_CODEC_INTERNAL_ABI_VERSION
,
VPX_CODEC_CAP_ENCODER
|
VPX_CODEC_CAP_PSNR
|
VPX_CODEC_CAP_OUTPUT_PARTITION
,
VPX_CODEC_CAP_ENCODER
|
VPX_CODEC_CAP_PSNR
,
/* vpx_codec_caps_t caps; */
vp9e_init
,
/* vpx_codec_init_fn_t init; */
vp9e_destroy
,
/* vpx_codec_destroy_fn_t destroy; */
...
...
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