summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Pöschel <github@basicmaster.de>2015-11-29 19:29:43 +0100
committerStefan Pöschel <github@basicmaster.de>2015-11-29 19:29:43 +0100
commitf3bcb1dc90666a37abf4478efdcd9d086e535804 (patch)
tree00c029c0e9c70246e8b51bdf860f5afd08b09dc6
parent363f9dfce6246f1711302b1a987322c190b90cc6 (diff)
downloadODR-AudioEnc-f3bcb1dc90666a37abf4478efdcd9d086e535804.tar.gz
ODR-AudioEnc-f3bcb1dc90666a37abf4478efdcd9d086e535804.tar.bz2
ODR-AudioEnc-f3bcb1dc90666a37abf4478efdcd9d086e535804.zip
MOT encoder: ensure JPEG files not to have progressive coding
-rw-r--r--src/mot-encoder.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mot-encoder.cpp b/src/mot-encoder.cpp
index 40831c7..0bddd86 100644
--- a/src/mot-encoder.cpp
+++ b/src/mot-encoder.cpp
@@ -965,6 +965,7 @@ int encodeFile(int output_fd, std::string& fname, int fidx, bool raw_slides)
MagickBooleanType err;
#endif
size_t blobsize, height, width;
+ bool jpeg_progr;
unsigned char *blob = NULL;
unsigned char *curseg = NULL;
MSCDG msc;
@@ -988,6 +989,9 @@ int encodeFile(int output_fd, std::string& fname, int fidx, bool raw_slides)
*
* For JPEG input files that are already at the right resolution and at the
* right blobsize, we disable this to avoid quality loss due to recompression
+ *
+ * As device support of this feature is optional, we furthermore require JPEG input
+ * files to not have progressive coding.
*/
bool resize_required = true;
@@ -1009,6 +1013,7 @@ int encodeFile(int output_fd, std::string& fname, int fidx, bool raw_slides)
height = MagickGetImageHeight(m_wand);
width = MagickGetImageWidth(m_wand);
orig_format = MagickGetImageFormat(m_wand);
+ jpeg_progr = MagickGetImageInterlaceScheme(m_wand) == JPEGInterlace;
// By default assume that the image has full quality and can be reduced
orig_quality = 100;
@@ -1023,8 +1028,8 @@ int encodeFile(int output_fd, std::string& fname, int fidx, bool raw_slides)
if (verbose) {
fprintf(stderr, "mot-encoder image: %s (id=%d)."
- " Original size: %zu x %zu. (%s, q=%zu)\n",
- fname.c_str(), fidx, width, height, orig_format, orig_quality);
+ " Original size: %zu x %zu. (%s, q=%zu, progr=%s)\n",
+ fname.c_str(), fidx, width, height, orig_format, orig_quality, jpeg_progr ? "y" : "n");
}
}
else if (strcmp(orig_format, "PNG") == 0) {
@@ -1053,7 +1058,7 @@ int encodeFile(int output_fd, std::string& fname, int fidx, bool raw_slides)
fname.c_str(), fidx, width, height);
}
- if ((orig_is_jpeg || orig_is_png) && height == 240 && width == 320) {
+ if ((orig_is_jpeg || orig_is_png) && height == 240 && width == 320 && not jpeg_progr) {
// Don't recompress the image and check if the blobsize is suitable
blob = MagickGetImagesBlob(m_wand, &blobsize);