mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-06-21 12:09:31 -04:00
SWScale::Convert chose av_image_fill_arrays alignment by heuristic (width % 32 ? 1 : 32) for both buffers. Image buffers are always laid out align-32, so any width not divisible by 32 made Convert read luma rows 16 bytes short and chroma planes from packed offsets: diagonal shear plus garbage chroma. Rotating a monitor is what produces such widths (1280x720 ROTATE_270 -> 720 wide, 3840x2160 ROTATE_90 -> 2160 wide, both % 32 == 16), so every scaled view and every re-encode of a rotated monitor was corrupted while unrotated monitors (1280/2688/3840 all % 32 == 0) were untouched. The rotate/flip segfault fix exposed this: before it, rotated planar frames crashed zmc before reaching Scale. Alignment is a fact about how a buffer was laid out, not something derivable from dimensions. Convert now takes explicit in/out alignment: Image::Scale passes 32/32, the videostore encode path mirrors get_out_frame's allocation choice, libvnc passes 1 (packed VNC framebuffer) and 32 (Image WriteBuffer). Remove the unused SetDefaults/ConvertDefaults API rather than threading alignments through dead code. Tests: new Scale regression case on a 720x1280 YUV420P image (column-banded luma, uniform chroma) fails before the fix exactly as observed live (sheared rows, V plane reading 0) and passes after. Full suite 84/84. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
210 lines
8.7 KiB
C++
210 lines
8.7 KiB
C++
/*
|
|
* This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "zm_catch2.h"
|
|
|
|
#include "zm_config.h"
|
|
#include "zm_image.h"
|
|
#include "zm_rgb.h"
|
|
|
|
extern "C" {
|
|
#include <libavutil/imgutils.h>
|
|
}
|
|
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
|
|
namespace {
|
|
|
|
// Image::Initialise() loads the timestamp font from the DB-backed config,
|
|
// which the test binary doesn't have; point it at the test fixture font.
|
|
void bootstrap_image_config() {
|
|
config.font_file_location = "data/fonts/04_valid.zmfnt";
|
|
}
|
|
|
|
struct Planes {
|
|
uint8_t *data[4] = {nullptr, nullptr, nullptr, nullptr};
|
|
int stride[4] = {0, 0, 0, 0};
|
|
};
|
|
|
|
// View an Image's buffer with the same layout Image uses internally
|
|
// (av_image_fill_arrays, align 32).
|
|
Planes plane_view(Image &image, AVPixelFormat fmt, int w, int h) {
|
|
Planes planes;
|
|
REQUIRE(av_image_fill_arrays(planes.data, planes.stride, image.Buffer(),
|
|
fmt, w, h, 32) > 0);
|
|
return planes;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// Regression: Image::Rotate/Flip computed chroma plane dimensions with
|
|
// AV_CEIL_RSHIFT on unsigned operands. The macro's runtime form
|
|
// -((-(a)) >> (b)) is only valid for signed types; with unsigned width it
|
|
// yields 2^31 + width/2, sending the chroma loops billions of samples out
|
|
// of bounds (segfault on every rotated planar image - decoder thread crash
|
|
// on any monitor with a rotated orientation).
|
|
TEST_CASE("Image::Rotate YUV420P", "[image]") {
|
|
bootstrap_image_config();
|
|
const int w = 1280, h = 720;
|
|
Image image(w, h, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_YUV420P);
|
|
REQUIRE(image.Buffer() != nullptr);
|
|
|
|
// Distinct fill per plane + a marker pixel in each
|
|
Planes src = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
memset(src.data[0], 0x10, static_cast<size_t>(src.stride[0]) * h);
|
|
memset(src.data[1], 0x20, static_cast<size_t>(src.stride[1]) * (h / 2));
|
|
memset(src.data[2], 0x30, static_cast<size_t>(src.stride[2]) * (h / 2));
|
|
src.data[0][20 * src.stride[0] + 10] = 200; // luma (10, 20)
|
|
src.data[1][30 * src.stride[1] + 40] = 210; // U (40, 30)
|
|
src.data[2][50 * src.stride[2] + 60] = 220; // V (60, 50)
|
|
|
|
SECTION("rotate 90") {
|
|
image.Rotate(90);
|
|
REQUIRE(image.Width() == static_cast<unsigned int>(h));
|
|
REQUIRE(image.Height() == static_cast<unsigned int>(w));
|
|
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, h, w);
|
|
// 90deg: (sx, sy) -> (dx, dy) = (src_h-1-sy, sx)
|
|
REQUIRE(dst.data[0][10 * dst.stride[0] + (h - 1 - 20)] == 200);
|
|
// chroma plane is (w/2 x h/2): (40, 30) -> (h/2-1-30, 40)
|
|
REQUIRE(dst.data[1][40 * dst.stride[1] + (h / 2 - 1 - 30)] == 210);
|
|
REQUIRE(dst.data[2][60 * dst.stride[2] + (h / 2 - 1 - 50)] == 220);
|
|
}
|
|
|
|
SECTION("rotate 180") {
|
|
image.Rotate(180);
|
|
REQUIRE(image.Width() == static_cast<unsigned int>(w));
|
|
REQUIRE(image.Height() == static_cast<unsigned int>(h));
|
|
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
// 180deg: (sx, sy) -> (src_w-1-sx, src_h-1-sy)
|
|
REQUIRE(dst.data[0][(h - 1 - 20) * dst.stride[0] + (w - 1 - 10)] == 200);
|
|
REQUIRE(dst.data[1][(h / 2 - 1 - 30) * dst.stride[1] + (w / 2 - 1 - 40)] == 210);
|
|
REQUIRE(dst.data[2][(h / 2 - 1 - 50) * dst.stride[2] + (w / 2 - 1 - 60)] == 220);
|
|
}
|
|
|
|
SECTION("rotate 270") {
|
|
image.Rotate(270);
|
|
REQUIRE(image.Width() == static_cast<unsigned int>(h));
|
|
REQUIRE(image.Height() == static_cast<unsigned int>(w));
|
|
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, h, w);
|
|
// 270deg: (sx, sy) -> (dx, dy) = (sy, src_w-1-sx)
|
|
REQUIRE(dst.data[0][(w - 1 - 10) * dst.stride[0] + 20] == 200);
|
|
REQUIRE(dst.data[1][(w / 2 - 1 - 40) * dst.stride[1] + 30] == 210);
|
|
REQUIRE(dst.data[2][(w / 2 - 1 - 60) * dst.stride[2] + 50] == 220);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("Image::Rotate YUV420P odd dimensions", "[image]") {
|
|
bootstrap_image_config();
|
|
// Odd luma dims exercise the ceiling in the chroma plane size: 101x57
|
|
// luma -> 51x29 chroma.
|
|
const int w = 101, h = 57;
|
|
Image image(w, h, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_YUV420P);
|
|
|
|
Planes src = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
const int cw = (w + 1) / 2, ch = (h + 1) / 2;
|
|
memset(src.data[0], 0x10, static_cast<size_t>(src.stride[0]) * h);
|
|
memset(src.data[1], 0x20, static_cast<size_t>(src.stride[1]) * ch);
|
|
memset(src.data[2], 0x30, static_cast<size_t>(src.stride[2]) * ch);
|
|
// Marker in the LAST chroma column/row - the part flooring would drop
|
|
src.data[1][(ch - 1) * src.stride[1] + (cw - 1)] = 211;
|
|
|
|
image.Rotate(90);
|
|
REQUIRE(image.Width() == static_cast<unsigned int>(h));
|
|
REQUIRE(image.Height() == static_cast<unsigned int>(w));
|
|
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, h, w);
|
|
// (cw-1, ch-1) -> (ch-1-(ch-1), cw-1) = (0, cw-1)
|
|
REQUIRE(dst.data[1][(cw - 1) * dst.stride[1] + 0] == 211);
|
|
}
|
|
|
|
// Regression: SWScale::Convert guessed each buffer's row alignment from
|
|
// `width % 32 ? 1 : 32`. Image buffers are ALWAYS laid out align-32
|
|
// (av_image_fill_arrays/av_image_get_buffer_size with align=32), so for any
|
|
// width not divisible by 32 the converter read luma rows 16 bytes short and
|
|
// chroma planes from packed (wrong) offsets. Rotating a 1280x720 monitor
|
|
// yields exactly such a width (720 % 32 == 16): every Scale() of a rotated
|
|
// frame came out sheared with garbage chroma, while unrotated monitors
|
|
// (width % 32 == 0) were untouched.
|
|
TEST_CASE("Image::Scale YUV420P with non-32-multiple width", "[image]") {
|
|
bootstrap_image_config();
|
|
const int w = 720, h = 1280; // rotated 1280x720, as ROTATE_90/270 produces
|
|
Image image(w, h, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_YUV420P);
|
|
REQUIRE(image.Buffer() != nullptr);
|
|
|
|
// Column-banded luma (every row identical: left half 50, right half 200)
|
|
// and uniform chroma. Any per-row drift or plane-offset error shows up as
|
|
// rows that differ from each other or chroma that isn't the fill value.
|
|
Planes src = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
for (int y = 0; y < h; y++) {
|
|
uint8_t *row = src.data[0] + static_cast<size_t>(y) * src.stride[0];
|
|
memset(row, 50, w / 2);
|
|
memset(row + w / 2, 200, w - w / 2);
|
|
}
|
|
memset(src.data[1], 100, static_cast<size_t>(src.stride[1]) * (h / 2));
|
|
memset(src.data[2], 160, static_cast<size_t>(src.stride[2]) * (h / 2));
|
|
|
|
image.Scale(w / 2, h / 2);
|
|
REQUIRE(image.Width() == static_cast<unsigned int>(w / 2));
|
|
REQUIRE(image.Height() == static_cast<unsigned int>(h / 2));
|
|
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, w / 2, h / 2);
|
|
// Identical input rows must produce identical output rows. Sample the
|
|
// middle of each band, away from the edge where bilinear blends.
|
|
for (int y : {0, h / 8, h / 4, h / 2 - 1}) {
|
|
const uint8_t *row = dst.data[0] + static_cast<size_t>(y) * dst.stride[0];
|
|
INFO("output luma row " << y);
|
|
CHECK(std::abs(static_cast<int>(row[w / 8]) - 50) <= 4);
|
|
CHECK(std::abs(static_cast<int>(row[w / 4 + w / 8]) - 200) <= 4);
|
|
}
|
|
for (int y : {0, h / 8, h / 4 - 1}) {
|
|
INFO("output chroma row " << y);
|
|
CHECK(std::abs(static_cast<int>(dst.data[1][static_cast<size_t>(y) * dst.stride[1] + w / 8]) - 100) <= 4);
|
|
CHECK(std::abs(static_cast<int>(dst.data[2][static_cast<size_t>(y) * dst.stride[2] + w / 8]) - 160) <= 4);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("Image::Flip YUV420P", "[image]") {
|
|
bootstrap_image_config();
|
|
const int w = 640, h = 480;
|
|
Image image(w, h, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_YUV420P);
|
|
|
|
Planes src = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
memset(src.data[0], 0x10, static_cast<size_t>(src.stride[0]) * h);
|
|
memset(src.data[1], 0x20, static_cast<size_t>(src.stride[1]) * (h / 2));
|
|
memset(src.data[2], 0x30, static_cast<size_t>(src.stride[2]) * (h / 2));
|
|
src.data[0][20 * src.stride[0] + 10] = 200;
|
|
src.data[1][30 * src.stride[1] + 40] = 210;
|
|
|
|
SECTION("horizontal") {
|
|
image.Flip(true);
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
REQUIRE(dst.data[0][20 * dst.stride[0] + (w - 1 - 10)] == 200);
|
|
REQUIRE(dst.data[1][30 * dst.stride[1] + (w / 2 - 1 - 40)] == 210);
|
|
}
|
|
|
|
SECTION("vertical") {
|
|
image.Flip(false);
|
|
Planes dst = plane_view(image, AV_PIX_FMT_YUV420P, w, h);
|
|
REQUIRE(dst.data[0][(h - 1 - 20) * dst.stride[0] + 10] == 200);
|
|
REQUIRE(dst.data[1][(h / 2 - 1 - 30) * dst.stride[1] + 40] == 210);
|
|
}
|
|
}
|