# HG changeset patch # User Ryan VanderMeulen # Date 1695856343 0 # Node ID c53f5ef77b62b79af86951a7f9130e1896b695d2 # Parent 90445136a15d059a272041ef3c4a277732b346b6 Bug 1855550 - VP8: disallow thread count changes. r=jesup Cherry-pick of upstream libvpx commits: https://chromium.googlesource.com/webm/libvpx/+/af6dedd715f4307669366944cca6e0417b290282 https://chromium.googlesource.com/webm/libvpx/+/3fbd1dca6a4d2dad332a2110d646e4ffef36d590 Differential Revision: https://phabricator.services.mozilla.com/D189428 Origin: https://hg.mozilla.org/mozilla-central/raw-rev/c53f5ef77b62b79af86951a7f9130e1896b695d2 --- media/libvpx/libvpx/vp8/encoder/onyx_if.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/media/libvpx/libvpx/vp8/encoder/onyx_if.c b/media/libvpx/libvpx/vp8/encoder/onyx_if.c index 2b059a1..8d05668 100644 --- a/media/libvpx/libvpx/vp8/encoder/onyx_if.c +++ b/media/libvpx/libvpx/vp8/encoder/onyx_if.c @@ -1445,6 +1445,12 @@ 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.33.0