fix bug in jpeg decoder

Author: mpromonet

.gitignore

@@ -4,3 +4,7 @@ v4l2source_yuv
 v4l2compress
 v4l2uncompress_jpeg
 *.a
+CMakeCache.txt
+CMakeFiles/
+*.cmake
+

CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.0)
+
+# set project name from current directory
+get_filename_component(BASENAME ${CMAKE_SOURCE_DIR} NAME)
+project(${BASENAME})
+
+set (CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_FLAGS "-Wall")
+set(CMAKE_CXX_FLAGS "-Wall")
+
+# define executable to build
+include_directories("include")
+add_executable(${PROJECT_NAME} src/v4l2compress.cpp)
+
+# v4l2wrapper
+aux_source_directory(v4l2wrapper/src LIBSRC_FILES)
+include_directories("v4l2wrapper/inc")
+add_library(v4l2wrapper STATIC ${LIBSRC_FILES})
+target_link_libraries (${PROJECT_NAME} v4l2wrapper)
+
+#libyuv
+include(FindJPEG)
+if (JPEG_FOUND)
+  include_directories(${JPEG_INCLUDE_DIR})
+  target_link_libraries(${PROJECT_NAME} ${JPEG_LIBRARY})
+  add_definitions(-DHAVE_JPEG)
+endif()
+
+add_subdirectory(libyuv EXCLUDE_FROM_ALL)
+include_directories("libyuv/include")
+target_link_libraries (${PROJECT_NAME} yuv)

include/codecfactory.h

@@ -27,7 +27,7 @@ class CodecFactory {
         Codec* Create(int outformat, int informat, int width, int height, const std::map<std::string,std::string> & opt, int verbose) {
                 Codec* convertor = NULL;
                 auto itDecoder = m_registryDecoder.find(informat);
-                if (itDecoder != std::end(m_registryEncoder)) {
+                if (itDecoder != std::end(m_registryDecoder)) {
                         convertor = itDecoder->second(outformat, informat, width, height, opt, verbose);
                 } else {
                         auto itEncoder = m_registryEncoder.find(outformat);

include/jpegdecoder.h

@@ -36,10 +36,9 @@ class JpegDecoder : public Codec {
 				jpeg_mem_src(&m_cinfo, (unsigned char*)buffer, rsize);	
 				jpeg_read_header(&m_cinfo, TRUE);
 				LOG(INFO) << "width:" << m_cinfo.image_width << " height:" << m_cinfo.image_height << " num_components:" << m_cinfo.num_components; 
+				m_cinfo.out_color_space = JCS_YCbCr;
 
 				jpeg_start_decompress(&m_cinfo);
-				unsigned int image_size = m_cinfo.image_width * m_cinfo.image_height * m_cinfo.num_components;
-				unsigned char image_buffer[image_size];	
 
 				unsigned char bufline[m_cinfo.image_width *  m_cinfo.num_components]; 
 				while (m_cinfo.output_scanline < m_cinfo.output_height) 
@@ -63,7 +62,7 @@ class JpegDecoder : public Codec {
                                         m_width, m_height,
                                         m_outformat);
 
-                int wsize = videoOutput->write((char *)image_buffer,image_size);
+                int wsize = videoOutput->write((char *)outBuffer,videoOutput->getBufferSize());
                 LOG(DEBUG) << "Copied size:" << wsize;
 
 		}