ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with scan printout

Browse Source 
Incorrect values of scan parameter Al were printed out in verbose mode
This commit is contained in:
Frank Bossen
2014-08-13 15:35:29 +02:00
parent 7464e5fe76
commit 05a5f4a9cc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jcmaster.c
View File

@@ -45,6 +45,7 @@ typedef struct {
int pass_number_scan_opt_base; /* pass number where scan optimization begins */ int pass_number_scan_opt_base; /* pass number where scan optimization begins */
unsigned char * scan_buffer[64]; /* buffer for a given scan */ unsigned char * scan_buffer[64]; /* buffer for a given scan */
unsigned long scan_size[64]; /* size for a given scan */ unsigned long scan_size[64]; /* size for a given scan */
int actual_Al[64]; /* actual value of Al used for a scan */
unsigned long best_cost; /* bit count for best frequency split */ unsigned long best_cost; /* bit count for best frequency split */
int best_freq_split_idx_luma; /* index for best frequency split (luma) */ int best_freq_split_idx_luma; /* index for best frequency split (luma) */
int best_freq_split_idx_chroma; /* index for best frequency split (chroma) */ int best_freq_split_idx_chroma; /* index for best frequency split (chroma) */
@@ -364,6 +365,8 @@ select_scan_parameters (j_compress_ptr cinfo)
master->scan_number < cinfo->num_scans) master->scan_number < cinfo->num_scans)
cinfo->Al = master->best_Al_chroma; cinfo->Al = master->best_Al_chroma;
} }
/* save value for later retrieval during printout of scans */
master->actual_Al[master->scan_number] = cinfo->Al;
} }
else else
#endif #endif
@@ -613,7 +616,7 @@ copy_buffer (j_compress_ptr cinfo, int scan_idx)
for (i = 0; i < cinfo->scan_info[scan_idx].comps_in_scan; i++) for (i = 0; i < cinfo->scan_info[scan_idx].comps_in_scan; i++)
fprintf(stderr, "%s%d", (i==0)?"":",", cinfo->scan_info[scan_idx].component_index[i]); fprintf(stderr, "%s%d", (i==0)?"":",", cinfo->scan_info[scan_idx].component_index[i]);
fprintf(stderr, ": %d %d", cinfo->scan_info[scan_idx].Ss, cinfo->scan_info[scan_idx].Se); fprintf(stderr, ": %d %d", cinfo->scan_info[scan_idx].Ss, cinfo->scan_info[scan_idx].Se);
fprintf(stderr, " %d %d", cinfo->scan_info[scan_idx].Ah, cinfo->scan_info[scan_idx].Al); fprintf(stderr, " %d %d", cinfo->scan_info[scan_idx].Ah, master->actual_Al[scan_idx]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }