ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle other colours and subpixel formats in Image::Image(AvFrame*) than 32bit RGBA

pull/2848/head
Isaac Connor 2020-02-21 09:34:44 -05:00
parent 7645196bdc
commit b4729f5aa8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_image.cpp
View File

@ -167,8 +167,20 @@ Image::Image( const AVFrame *frame ) {
width = frame->width;
height = frame->height;
pixels = width*height;
if ( frame->format == AV_PIX_FMT_RGBA ) {
colours = ZM_COLOUR_RGB32;
subpixelorder = ZM_SUBPIX_ORDER_RGBA;
} else if ( frame->format == AV_PIX_FMT_RGB24 ) {
colours = ZM_COLOUR_RGB24;
subpixelorder = ZM_SUBPIX_ORDER_RGB;
} else if ( frame->format == AV_PIX_FMT_GRAY8 ) {
colours = ZM_COLOUR_GRAY8;
subpixelorder = ZM_SUBPIX_ORDER_NONE;
} else {
Error("Unhandled frame format: %d", frame->format);
}
size = pixels*colours;
buffer = 0;
holdbuffer = 0;