/*
* jcmainct.c
*
- * Copyright (C) 1994-1996, Thomas G. Lane.
+ * Copyright (C) 1994-1998, Thomas G. Lane.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
METHODDEF(void)
start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
{
- my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
+ my_main_ptr main = (my_main_ptr) cinfo->main;
/* Do nothing in raw-data mode. */
if (cinfo->raw_data_in)
return;
- mainPtr->cur_iMCU_row = 0; /* initialize counters */
- mainPtr->rowgroup_ctr = 0;
- mainPtr->suspended = FALSE;
- mainPtr->pass_mode = pass_mode; /* save mode for use by process_data */
+ main->cur_iMCU_row = 0; /* initialize counters */
+ main->rowgroup_ctr = 0;
+ main->suspended = FALSE;
+ main->pass_mode = pass_mode; /* save mode for use by process_data */
switch (pass_mode) {
case JBUF_PASS_THRU:
#ifdef FULL_MAIN_BUFFER_SUPPORTED
- if (mainPtr->whole_image[0] != NULL)
+ if (main->whole_image[0] != NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
#endif
- mainPtr->pub.process_data = process_data_simple_main;
+ main->pub.process_data = process_data_simple_main;
break;
#ifdef FULL_MAIN_BUFFER_SUPPORTED
case JBUF_SAVE_SOURCE:
case JBUF_CRANK_DEST:
case JBUF_SAVE_AND_PASS:
- if (mainPtr->whole_image[0] == NULL)
+ if (main->whole_image[0] == NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
- mainPtr->pub.process_data = process_data_buffer_main;
+ main->pub.process_data = process_data_buffer_main;
break;
#endif
default:
JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
JDIMENSION in_rows_avail)
{
- my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
+ my_main_ptr main = (my_main_ptr) cinfo->main;
+ JDIMENSION data_unit = (JDIMENSION)(cinfo->data_unit);
- while (mainPtr->cur_iMCU_row < cinfo->total_iMCU_rows) {
+ while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
/* Read input data if we haven't filled the main buffer yet */
- if (mainPtr->rowgroup_ctr < DCTSIZE)
+ if (main->rowgroup_ctr < data_unit)
(*cinfo->prep->pre_process_data) (cinfo,
input_buf, in_row_ctr, in_rows_avail,
- mainPtr->buffer, &mainPtr->rowgroup_ctr,
- (JDIMENSION) DCTSIZE);
+ main->buffer, &main->rowgroup_ctr,
+ (JDIMENSION) data_unit);
/* If we don't have a full iMCU row buffered, return to application for
* more data. Note that preprocessor will always pad to fill the iMCU row
* at the bottom of the image.
*/
- if (mainPtr->rowgroup_ctr != DCTSIZE)
+ if (main->rowgroup_ctr != data_unit)
return;
/* Send the completed row to the compressor */
- if (! (*cinfo->coef->compress_data) (cinfo, mainPtr->buffer)) {
+ if (! (*cinfo->codec->compress_data) (cinfo, main->buffer)) {
/* If compressor did not consume the whole row, then we must need to
* suspend processing and return to the application. In this situation
* we pretend we didn't yet consume the last input row; otherwise, if
* it happened to be the last row of the image, the application would
* think we were done.
*/
- if (! mainPtr->suspended) {
+ if (! main->suspended) {
(*in_row_ctr)--;
- mainPtr->suspended = TRUE;
+ main->suspended = TRUE;
}
return;
}
/* We did finish the row. Undo our little suspension hack if a previous
* call suspended; then mark the main buffer empty.
*/
- if (mainPtr->suspended) {
+ if (main->suspended) {
(*in_row_ctr)++;
- mainPtr->suspended = FALSE;
+ main->suspended = FALSE;
}
- mainPtr->rowgroup_ctr = 0;
- mainPtr->cur_iMCU_row++;
+ main->rowgroup_ctr = 0;
+ main->cur_iMCU_row++;
}
}
JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
JDIMENSION in_rows_avail)
{
- my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
+ my_main_ptr main = (my_main_ptr) cinfo->main;
int ci;
jpeg_component_info *compptr;
- boolean writing = (mainPtr->pass_mode != JBUF_CRANK_DEST);
+ boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
+ JDIMENSION data_unit = (JDIMENSION)(cinfo->data_unit);
- while (mainPtr->cur_iMCU_row < cinfo->total_iMCU_rows) {
+ while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
/* Realign the virtual buffers if at the start of an iMCU row. */
- if (mainPtr->rowgroup_ctr == 0) {
+ if (main->rowgroup_ctr == 0) {
for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
ci++, compptr++) {
- mainPtr->buffer[ci] = (*cinfo->mem->access_virt_sarray)
- ((j_common_ptr) cinfo, mainPtr->whole_image[ci],
- mainPtr->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
- (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
+ main->buffer[ci] = (*cinfo->mem->access_virt_sarray)
+ ((j_common_ptr) cinfo, main->whole_image[ci],
+ main->cur_iMCU_row * (compptr->v_samp_factor * data_unit),
+ (JDIMENSION) (compptr->v_samp_factor * data_unit), writing);
}
/* In a read pass, pretend we just read some source data. */
if (! writing) {
- *in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
- mainPtr->rowgroup_ctr = DCTSIZE;
+ *in_row_ctr += cinfo->max_v_samp_factor * data_unit;
+ main->rowgroup_ctr = data_unit;
}
}
if (writing) {
(*cinfo->prep->pre_process_data) (cinfo,
input_buf, in_row_ctr, in_rows_avail,
- mainPtr->buffer, &mainPtr->rowgroup_ctr,
- (JDIMENSION) DCTSIZE);
+ main->buffer, &main->rowgroup_ctr,
+ (JDIMENSION) data_unit);
/* Return to application if we need more data to fill the iMCU row. */
- if (mainPtr->rowgroup_ctr < DCTSIZE)
+ if (main->rowgroup_ctr < data_unit)
return;
}
/* Emit data, unless this is a sink-only pass. */
- if (mainPtr->pass_mode != JBUF_SAVE_SOURCE) {
- if (! (*cinfo->coef->compress_data) (cinfo, mainPtr->buffer)) {
+ if (main->pass_mode != JBUF_SAVE_SOURCE) {
+ if (! (*cinfo->codec->compress_data) (cinfo, main->buffer)) {
/* If compressor did not consume the whole row, then we must need to
* suspend processing and return to the application. In this situation
* we pretend we didn't yet consume the last input row; otherwise, if
* it happened to be the last row of the image, the application would
* think we were done.
*/
- if (! mainPtr->suspended) {
+ if (! main->suspended) {
(*in_row_ctr)--;
- mainPtr->suspended = TRUE;
+ main->suspended = TRUE;
}
return;
}
/* We did finish the row. Undo our little suspension hack if a previous
* call suspended; then mark the main buffer empty.
*/
- if (mainPtr->suspended) {
+ if (main->suspended) {
(*in_row_ctr)++;
- mainPtr->suspended = FALSE;
+ main->suspended = FALSE;
}
}
/* If get here, we are done with this iMCU row. Mark buffer empty. */
- mainPtr->rowgroup_ctr = 0;
- mainPtr->cur_iMCU_row++;
+ main->rowgroup_ctr = 0;
+ main->cur_iMCU_row++;
}
}
GLOBAL(void)
jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
{
- my_main_ptr mainPtr;
+ my_main_ptr main;
int ci;
jpeg_component_info *compptr;
+ int data_unit = cinfo->data_unit;
- mainPtr = (my_main_ptr)
+ main = (my_main_ptr)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
SIZEOF(my_main_controller));
- cinfo->main = (struct jpeg_c_main_controller *) mainPtr;
- mainPtr->pub.start_pass = start_pass_main;
+ cinfo->main = (struct jpeg_c_main_controller *) main;
+ main->pub.start_pass = start_pass_main;
/* We don't need to create a buffer in raw-data mode. */
if (cinfo->raw_data_in)
/* Note we pad the bottom to a multiple of the iMCU height */
for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
ci++, compptr++) {
- mainPtr->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+ main->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
- compptr->width_in_blocks * DCTSIZE,
- (JDIMENSION) jround_up((long) compptr->height_in_blocks,
- (long) compptr->v_samp_factor) * DCTSIZE,
- (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+ compptr->width_in_data_units * data_unit,
+ (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+ (long) compptr->v_samp_factor) * data_unit,
+ (JDIMENSION) (compptr->v_samp_factor * data_unit));
}
#else
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
#endif
} else {
#ifdef FULL_MAIN_BUFFER_SUPPORTED
- mainPtr->whole_image[0] = NULL; /* flag for no virtual arrays */
+ main->whole_image[0] = NULL; /* flag for no virtual arrays */
#endif
/* Allocate a strip buffer for each component */
for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
ci++, compptr++) {
- mainPtr->buffer[ci] = (*cinfo->mem->alloc_sarray)
+ main->buffer[ci] = (*cinfo->mem->alloc_sarray)
((j_common_ptr) cinfo, JPOOL_IMAGE,
- compptr->width_in_blocks * DCTSIZE,
- (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+ compptr->width_in_data_units * data_unit,
+ (JDIMENSION) (compptr->v_samp_factor * data_unit));
}
}
}