renamed v4l2_to_png

Former-commit-id: 87b89104673285a0a225fef53106f13c17bb22ac
This commit is contained in:
johan 2014-01-12 19:54:10 +01:00
parent 545f2ee114
commit c65cf872d1
5 changed files with 9 additions and 5 deletions

View File

@ -36,7 +36,7 @@ if (ENABLE_DISPMANX)
endif (ENABLE_DISPMANX)
if (ENABLE_V4L2)
add_subdirectory(v4l2png)
add_subdirectory(v4l2_to_png)
endif (ENABLE_V4L2)
add_executable(test_blackborderdetector

View File

@ -4,14 +4,14 @@ find_package(Qt4 REQUIRED QtCore QtGui)
include_directories(${QT_INCLUDES})
add_executable(v4l_to_png
v4l2png.cpp
add_executable(v4l2_to_png
v4l2_to_png.cpp
V4L2Grabber.h
V4L2Grabber.cpp)
target_link_libraries(v4l_to_png
target_link_libraries(v4l2_to_png
getoptPlusPlus)
qt4_use_modules(v4l_to_png
qt4_use_modules(v4l2_to_png
Core
Gui)

View File

@ -96,7 +96,10 @@ void V4L2Grabber::capture(int frameCount)
}
if (read_frame())
{
break;
}
/* EAGAIN - continue select loop. */
}
}
@ -590,6 +593,7 @@ void V4L2Grabber::process_image(const uint8_t * data)
int width = (_width + _pixelDecimation/2) / _pixelDecimation;
int height = (_height + _pixelDecimation/2) / _pixelDecimation;
QImage image(width, height, QImage::Format_RGB888);
for (int ySource = _pixelDecimation/2, yDest = 0; ySource < _height; ySource += _pixelDecimation, ++yDest)