Commit 5d5e49621b8db438d0d33a645917e64f570851c5
1 parent
7c1c657d
Exists in
master
and in
2 other branches
staged.
Showing
2 changed files
with
23 additions
and
6 deletions
Show diff stats
mjpeg/__init__.py
| @@ -304,21 +304,19 @@ class Jpeg(Jsteg): | @@ -304,21 +304,19 @@ class Jpeg(Jsteg): | ||
| 304 | 304 | ||
| 305 | 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 | 305 | 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 |
| 306 | """ | 306 | """ |
| 307 | - table0 = self.quant_tables[0].ravel() | ||
| 308 | - table1 = self.quant_tables[1].ravel() | ||
| 309 | - sum0 = np.sum(table0) | ||
| 310 | - sum1 = np.sum(table1) | 307 | + sum0 = np.sum(self.quant_tables[0]) |
| 308 | + sum1 = np.sum(self.quant_tables[1]) | ||
| 311 | quality = None | 309 | quality = None |
| 312 | 310 | ||
| 313 | if sum0 != None: | 311 | if sum0 != None: |
| 314 | if sum1 != None: | 312 | if sum1 != None: |
| 315 | sum = sum0 + sum1 | 313 | sum = sum0 + sum1 |
| 316 | - qvalue = table0[2] + table0[53] + table1[0] + table1[-1] | 314 | + 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] |
| 317 | hashtable = bi_hash | 315 | hashtable = bi_hash |
| 318 | sumtable = bi_sum | 316 | sumtable = bi_sum |
| 319 | else: | 317 | else: |
| 320 | sum = sum0 | 318 | sum = sum0 |
| 321 | - qvalue = table0[2] + table0[53] | 319 | + qvalue = self.quant_tables[0].ravel()[2] + self.quant_tables[0].ravel()[53] |
| 322 | hashtable = single_hash | 320 | hashtable = single_hash |
| 323 | sumtable = single_sum | 321 | sumtable = single_sum |
| 324 | else: | 322 | else: |