Updated JPEGDecoder library

Author: robbie8-bit

src/utility/JPEGDecoder/library.json

@@ -1,6 +1,6 @@
 {
   "name": "JPEGDecoder",
-  "version": "1.7.9",
+  "version": "1.8.0",
   "keywords": "jpeg, jpg, decoder, TFT",
   "description": "A JPEG decoder library, tested on Mega, Due and ESP8266",
   "repository":

src/utility/JPEGDecoder/library.properties

@@ -1,5 +1,5 @@
 name=JPEGDecoder
-version=1.7.9
+version=1.8.0
 author=Bodmer <[email protected]>, Makoto Kurauchi, Rich Geldreich
 maintainer=Bodmer
 sentence= Jpeg decoder tested with Arduino Mega, Arduino Due and ESP8266 based NodeMCU 1.0

src/utility/JPEGDecoder/license.txt

@@ -0,0 +1,36 @@
+
+Arduino JPEGDecoder library
+===========================
+
+The original picojpeg.c and picojepeg.h code used in this Arduino library is hosted here:
+https://code.google.com/archive/p/picojpeg/
+
+The JPEGDecoder library has been developed from the Arduino library by Makoto Kurauchi here:
+https://github.com/MakotoKurauchi/JPEGDecoder
+
+The library has been developed and debugged by Bodmer and is hosted here:
+https://github.com/Bodmer/JPEGDecoder
+
+The picojpeg code and the developed library is dual licensed as both public domain and
+(where public domain is not acceptable) the MIT license:
+
+
+picojeg code: Copyright 2013 Rich Geldreich
+Arduino JPEGDecoder library: Copyright 2019  Makoto Kurauchi, Bodmer
+
+MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/utility/JPEGDecoder/src/JPEGDecoder.cpp

@@ -65,7 +65,7 @@ uint8_t JPEGDecoder::pjpeg_callback(uint8_t* pBuf, uint8_t buf_size, uint8_t *pB
 uint8_t JPEGDecoder::pjpeg_need_bytes_callback(uint8_t* pBuf, uint8_t buf_size, uint8_t *pBytes_actually_read, void *pCallback_data) {
 	uint n;
 
-	(void)pCallback_data;
+	//pCallback_data;
 
 	n = jpg_min(g_nInFileSize - g_nInFileOfs, buf_size);
 
@@ -76,6 +76,10 @@ uint8_t JPEGDecoder::pjpeg_need_bytes_callback(uint8_t* pBuf, uint8_t buf_size,
 		}
 	}
 
+#ifdef LOAD_SPIFFS
+	if (jpg_source == JPEG_FS_FILE) g_pInFileFs.read(pBuf,n); // else we are handling a file
+#endif
+
 #if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
 	if (jpg_source == JPEG_SD_FILE) g_pInFileSd.read(pBuf,n); // else we are handling a file
 #endif
@@ -300,20 +304,61 @@ int JPEGDecoder::decodeFile(const String& pFilename){
 }
 
 
+#ifdef LOAD_SPIFFS
+
+// Call specific to SPIFFS
+int JPEGDecoder::decodeFsFile(const char *pFilename) {
+
+	fs::File pInFile = SPIFFS.open( pFilename, "r");
+
+	return decodeFsFile(pInFile);
+}
+
+int JPEGDecoder::decodeFsFile(const String& pFilename) {
+
+	fs::File pInFile = SPIFFS.open( pFilename, "r");
+
+	return decodeFsFile(pInFile);
+}
+
+int JPEGDecoder::decodeFsFile(fs::File jpgFile) { // This is for the SPIFFS library
+
+	g_pInFileFs = jpgFile;
+
+	jpg_source = JPEG_FS_FILE; // Flag to indicate a SPIFFS file
+
+	if (!g_pInFileFs) {
+		#ifdef DEBUG
+		Serial.println("ERROR: SPIFFS file not found!");
+		#endif
+
+		return -1;
+	}
+
+	g_nInFileOfs = 0;
+
+	g_nInFileSize = g_pInFileFs.size();
+
+	return decodeCommon();
+
+}
+#endif
+
+
 #if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
 
 // Call specific to SD filing system in case leading / is used
 int JPEGDecoder::decodeSdFile(const char *pFilename) {
 
-	File pInFile = SD.open( pFilename);
+	File pInFile = SD.open( pFilename, FILE_READ);
 
 	return decodeSdFile(pInFile);
 }
 
 
 int JPEGDecoder::decodeSdFile(const String& pFilename) {
 #if !defined (ARDUINO_ARCH_SAM)
-	File pInFile = SD.open( pFilename);
+	File pInFile = SD.open( pFilename, FILE_READ);
 
 	return decodeSdFile(pInFile);
 #else
@@ -374,12 +419,14 @@ int JPEGDecoder::decodeCommon(void) {
 	status = pjpeg_decode_init(&image_info, pjpeg_callback, NULL, 0);
 
 	if (status) {
+		#ifdef DEBUG
 		Serial.print("pjpeg_decode_init() failed with status ");
 		Serial.println(status);
 
 		if (status == PJPG_UNSUPPORTED_MODE) {
 			Serial.println("Progressive JPEG files are not supported.");
 		}
+		#endif
 
 		return 0;
 	}
@@ -417,6 +464,10 @@ void JPEGDecoder::abort(void) {
 	if(pImage) delete[] pImage;
 	pImage = NULL;
 
+#ifdef LOAD_SPIFFS
+	if (jpg_source == JPEG_FS_FILE) if (g_pInFileFs) g_pInFileFs.close();
+#endif
+
 #if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
 	if (jpg_source == JPEG_SD_FILE) if (g_pInFileSd) g_pInFileSd.close();
 #endif

src/utility/JPEGDecoder/src/JPEGDecoder.h

@@ -10,7 +10,7 @@ Latest version here:
 https://github.com/Bodmer/JPEGDecoder
 
 */
-#define LOAD_SDFAT_LIBRARY
+
 #ifndef JPEGDECODER_H
 	#define JPEGDECODER_H
 
@@ -38,20 +38,22 @@ Latest version here:
 
 		#define LOAD_SPIFFS
 		#define FS_NO_GLOBALS
+		#include <FS.h>
 
 		#ifdef ESP32
+			#include "SPIFFS.h" // ESP32 only
 		#endif
 
 	#endif
 
 	#if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
 		#ifdef LOAD_SDFAT_LIBRARY
+			#include <SdFat.h> // Alternative where we might need to bit bash the SPI
 		#else
+			#include <SD.h>    // Default
 		#endif
 	#endif
 
-#include <SD.h> // Alternative where we might need to bit bash the SPI
-
 
 #include "picojpeg.h"
 
@@ -80,27 +82,31 @@ typedef unsigned int uint;
 class JPEGDecoder {
 
 private:
-//   SdFat SD;
-  File g_pInFileSd;
-  pjpeg_scan_type_t scan_type;
-  pjpeg_image_info_t image_info;
-
-  int is_available;
-  int mcu_x;
-  int mcu_y;
-  uint g_nInFileSize;
-  uint g_nInFileOfs;
-  uint row_pitch;
-  uint decoded_width, decoded_height;
-  uint row_blocks_per_mcu, col_blocks_per_mcu;
-  uint8 status;
-  uint8 jpg_source = 0;
-  uint8_t *jpg_data;
-
-  static uint8 pjpeg_callback(unsigned char *pBuf, unsigned char buf_size, unsigned char *pBytes_actually_read, void *pCallback_data);
-  uint8 pjpeg_need_bytes_callback(unsigned char *pBuf, unsigned char buf_size, unsigned char *pBytes_actually_read, void *pCallback_data);
-  int decode_mcu(void);
-  int decodeCommon(void);
+#if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
+	File g_pInFileSd;
+#endif
+#ifdef LOAD_SPIFFS
+	fs::File g_pInFileFs;
+#endif
+	pjpeg_scan_type_t scan_type;
+	pjpeg_image_info_t image_info;
+	
+	int is_available;
+	int mcu_x;
+	int mcu_y;
+	uint g_nInFileSize;
+	uint g_nInFileOfs;
+	uint row_pitch;
+	uint decoded_width, decoded_height;
+	uint row_blocks_per_mcu, col_blocks_per_mcu;
+	uint8 status;
+	uint8 jpg_source = 0;
+	uint8_t* jpg_data;
+	
+	static uint8 pjpeg_callback(unsigned char* pBuf, unsigned char buf_size, unsigned char *pBytes_actually_read, void *pCallback_data);
+	uint8 pjpeg_need_bytes_callback(unsigned char* pBuf, unsigned char buf_size, unsigned char *pBytes_actually_read, void *pCallback_data);
+	int decode_mcu(void);
+	int decodeCommon(void);
 public:
 
 	uint16_t *pImage;
@@ -136,7 +142,7 @@ class JPEGDecoder {
 #ifdef LOAD_SPIFFS
 	int decodeFsFile (const char *pFilename);
 	int decodeFsFile (const String& pFilename);
-	int decodeFsFile (File g_pInFile);
+	int decodeFsFile (fs::File g_pInFile);
 #endif
 
 	int decodeArray(const uint8_t array[], uint32_t  array_size);

src/utility/JPEGDecoder/src/picojpeg.c

@@ -716,11 +716,6 @@ static uint8 readSOSMarker(void)
    successive_high = (uint8)getBits1(4);
    successive_low  = (uint8)getBits1(4);
 
-   (void)spectral_start;
-   (void)spectral_end;
-   (void)successive_high;
-   (void)successive_low;
-
    left -= 3;
 
    while (left)                  
@@ -1027,7 +1022,6 @@ static uint8 processRestart(void)
 
    return 0;
 }
-/*
 //------------------------------------------------------------------------------
 // FIXME: findEOI() is not actually called at the end of the image 
 // (it's optional, and probably not needed on embedded devices)
@@ -1054,7 +1048,6 @@ static uint8 findEOI(void)
 
    return 0;
 }
-*/
 //------------------------------------------------------------------------------
 static uint8 checkHuffTables(void)
 {