ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All colourspaces now working

This commit is contained in:
Edward Barnard 2013-12-13 00:13:15 +00:00
parent c25011e781
commit e4a16ee57c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_libvlc_camera.cpp
View File

@ -47,16 +47,16 @@ LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, int p_width, in
/* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */ /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
if(colours == ZM_COLOUR_RGB32) { if(colours == ZM_COLOUR_RGB32) {
subpixelorder = ZM_SUBPIX_ORDER_RGBA; subpixelorder = ZM_SUBPIX_ORDER_BGRA;
mTargetChroma = "RV32"; mTargetChroma = "RV32";
mBpp = 4; mBpp = 4;
} else if(colours == ZM_COLOUR_RGB24) { } else if(colours == ZM_COLOUR_RGB24) {
subpixelorder = ZM_SUBPIX_ORDER_RGB; subpixelorder = ZM_SUBPIX_ORDER_BGR;
mTargetChroma = "RV24"; mTargetChroma = "RV24";
mBpp = 3; mBpp = 3;
} else if(colours == ZM_COLOUR_GRAY8) { } else if(colours == ZM_COLOUR_GRAY8) {
subpixelorder = ZM_SUBPIX_ORDER_NONE; subpixelorder = ZM_SUBPIX_ORDER_NONE;
mTargetChroma = "RGB8"; mTargetChroma = "GREY";
mBpp = 1; mBpp = 1;
} else { } else {
Panic("Unexpected colours: %d",colours); Panic("Unexpected colours: %d",colours);