From 5d5e49621b8db438d0d33a645917e64f570851c5 Mon Sep 17 00:00:00 2001 From: Chunk Date: Tue, 31 Mar 2015 20:16:59 +0800 Subject: [PATCH] staged. --- mdata/ANALYSIS.py | 19 +++++++++++++++++++ mjpeg/__init__.py | 10 ++++------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 mdata/ANALYSIS.py diff --git a/mdata/ANALYSIS.py b/mdata/ANALYSIS.py new file mode 100644 index 0000000..6af0de4 --- /dev/null +++ b/mdata/ANALYSIS.py @@ -0,0 +1,19 @@ +__author__ = 'chunk' + + + + + + + + + + + + + + + + + + diff --git a/mjpeg/__init__.py b/mjpeg/__init__.py index 23b9551..22014e8 100644 --- a/mjpeg/__init__.py +++ b/mjpeg/__init__.py @@ -304,21 +304,19 @@ class Jpeg(Jsteg): Ref - http://stackoverflow.com/questions/2024947/is-it-possible-to-tell-the-quality-level-of-a-jpeg,http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=20235 """ - table0 = self.quant_tables[0].ravel() - table1 = self.quant_tables[1].ravel() - sum0 = np.sum(table0) - sum1 = np.sum(table1) + sum0 = np.sum(self.quant_tables[0]) + sum1 = np.sum(self.quant_tables[1]) quality = None if sum0 != None: if sum1 != None: sum = sum0 + sum1 - qvalue = table0[2] + table0[53] + table1[0] + table1[-1] + qvalue = self.quant_tables[0].ravel()[2] + self.quant_tables[0].ravel()[53] + self.quant_tables[1].ravel()[0] + self.quant_tables[1].ravel()[-1] hashtable = bi_hash sumtable = bi_sum else: sum = sum0 - qvalue = table0[2] + table0[53] + qvalue = self.quant_tables[0].ravel()[2] + self.quant_tables[0].ravel()[53] hashtable = single_hash sumtable = single_sum else: -- libgit2 0.21.2