MSVSphere Packaging Team
11 months ago
parent
cc80f81f4e
commit
7d70094ea6
@ -0,0 +1,103 @@
|
||||
From 0b9c2b782ae87f820aa34a19be7be6268f258172 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Jiang <jianj@google.com>
|
||||
Date: Thu, 30 Jun 2022 13:48:56 -0400
|
||||
Subject: [PATCH] Fix bug with smaller width bigger size
|
||||
|
||||
Fixed previous patch that clusterfuzz failed on.
|
||||
|
||||
Local fuzzing passing overnight.
|
||||
|
||||
Bug: webm:1642
|
||||
Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9
|
||||
(cherry picked from commit 263682c9a29395055f3b3afe2d97be1828a6223f)
|
||||
---
|
||||
vp9/common/vp9_alloccommon.c | 13 ++++++-------
|
||||
vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++--
|
||||
2 files changed, 31 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
|
||||
index 7345e259b..2989ee015 100644
|
||||
--- a/vp9/common/vp9_alloccommon.c
|
||||
+++ b/vp9/common/vp9_alloccommon.c
|
||||
@@ -122,13 +122,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
|
||||
cm->free_mi(cm);
|
||||
if (cm->alloc_mi(cm, new_mi_size)) goto fail;
|
||||
}
|
||||
-
|
||||
- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
|
||||
- // Create the segmentation map structure and set to 0.
|
||||
- free_seg_map(cm);
|
||||
- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
|
||||
- }
|
||||
-
|
||||
if (cm->above_context_alloc_cols < cm->mi_cols) {
|
||||
vpx_free(cm->above_context);
|
||||
cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
|
||||
@@ -143,6 +136,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
|
||||
cm->above_context_alloc_cols = cm->mi_cols;
|
||||
}
|
||||
|
||||
+ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
|
||||
+ // Create the segmentation map structure and set to 0.
|
||||
+ free_seg_map(cm);
|
||||
+ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
|
||||
+ }
|
||||
+
|
||||
if (vp9_alloc_loop_filter(cm)) goto fail;
|
||||
|
||||
return 0;
|
||||
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
|
||||
index 2ae59dd98..01a6d907b 100644
|
||||
--- a/vp9/encoder/vp9_encoder.c
|
||||
+++ b/vp9/encoder/vp9_encoder.c
|
||||
@@ -1751,6 +1751,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
|
||||
}
|
||||
}
|
||||
|
||||
+static void free_copy_partition_data(VP9_COMP *cpi) {
|
||||
+ vpx_free(cpi->prev_partition);
|
||||
+ cpi->prev_partition = NULL;
|
||||
+ vpx_free(cpi->prev_segment_id);
|
||||
+ cpi->prev_segment_id = NULL;
|
||||
+ vpx_free(cpi->prev_variance_low);
|
||||
+ cpi->prev_variance_low = NULL;
|
||||
+ vpx_free(cpi->copied_frame_cnt);
|
||||
+ cpi->copied_frame_cnt = NULL;
|
||||
+}
|
||||
+
|
||||
void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
|
||||
VP9_COMMON *const cm = &cpi->common;
|
||||
RATE_CONTROL *const rc = &cpi->rc;
|
||||
@@ -1834,6 +1845,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
|
||||
new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
|
||||
if (cm->mi_alloc_size < new_mi_size) {
|
||||
vp9_free_context_buffers(cm);
|
||||
+ vp9_free_pc_tree(&cpi->td);
|
||||
+ vpx_free(cpi->mbmi_ext_base);
|
||||
alloc_compressor_data(cpi);
|
||||
realloc_segmentation_maps(cpi);
|
||||
cpi->initial_width = cpi->initial_height = 0;
|
||||
@@ -1849,8 +1862,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
|
||||
update_frame_size(cpi);
|
||||
|
||||
if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
|
||||
- memset(cpi->consec_zero_mv, 0,
|
||||
- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
|
||||
+ vpx_free(cpi->consec_zero_mv);
|
||||
+ CHECK_MEM_ERROR(
|
||||
+ cm, cpi->consec_zero_mv,
|
||||
+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
|
||||
+
|
||||
+ vpx_free(cpi->skin_map);
|
||||
+ CHECK_MEM_ERROR(
|
||||
+ cm, cpi->skin_map,
|
||||
+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
|
||||
+
|
||||
+ free_copy_partition_data(cpi);
|
||||
+ alloc_copy_partition_data(cpi);
|
||||
if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
|
||||
vp9_cyclic_refresh_reset_resize(cpi);
|
||||
rc->rc_1_frame = 0;
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 3a03995efe86129cde5df3a7de32fecdfce3259e Mon Sep 17 00:00:00 2001
|
||||
From: James Zern <jzern@google.com>
|
||||
Date: Mon, 25 Sep 2023 18:55:59 -0700
|
||||
Subject: [PATCH] VP8: disallow thread count changes
|
||||
|
||||
Currently allocations are done at encoder creation time. Going from
|
||||
threaded to non-threaded would cause a crash.
|
||||
|
||||
Bug: chromium:1486441
|
||||
Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4
|
||||
(cherry picked from commit 3fbd1dca6a4d2dad332a2110d646e4ffef36d590)
|
||||
---
|
||||
vp8/encoder/onyx_if.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
|
||||
index 224318242..e0c22070c 100644
|
||||
--- a/vp8/encoder/onyx_if.c
|
||||
+++ b/vp8/encoder/onyx_if.c
|
||||
@@ -1449,6 +1449,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) {
|
||||
last_h = cpi->oxcf.Height;
|
||||
prev_number_of_layers = cpi->oxcf.number_of_layers;
|
||||
|
||||
+ if (cpi->initial_width) {
|
||||
+ // TODO(https://crbug.com/1486441): Allow changing thread counts; the
|
||||
+ // allocation is done once in vp8_create_compressor().
|
||||
+ oxcf->multi_threaded = cpi->oxcf.multi_threaded;
|
||||
+ }
|
||||
cpi->oxcf = *oxcf;
|
||||
|
||||
switch (cpi->oxcf.Mode) {
|
||||
--
|
||||
2.41.0
|
||||
|
||||
Loading…
Reference in new issue