--- common/video/iso-mpeg4/src/vtc_main_vtcdec.cpp.orig 2005-05-04 13:56:00.000000000 -0600 +++ common/video/iso-mpeg4/src/vtc_main_vtcdec.cpp 2009-11-19 02:31:58.000000000 -0700 @@ -174,9 +174,9 @@ get_err_resilience_header(); if (TU_first != 0) - errorHandler("Reading incorrect TU_first in the first packet.\n"); + errorHandler((char*)"Reading incorrect TU_first in the first packet.\n"); if (get_X_bits(1) != 1) - errorHandler("Reading incorrect HEC in the first packet.\n"); + errorHandler((char*)"Reading incorrect HEC in the first packet.\n"); if (mzte_codec.m_iScanDirection==1) /* BB */ ; @@ -209,7 +209,7 @@ still_texture_object_start_code = get_X_bits(32); if (still_texture_object_start_code != STILL_TEXTURE_OBJECT_START_CODE) - errorHandler("Wrong texture_object_layer_start_code."); + errorHandler((char*)"Wrong texture_object_layer_start_code."); texture_object_id = get_X_bits(16); marker_bit = get_X_bits(1); @@ -278,7 +278,7 @@ // hjlee 0901 filters = (FILTER **)malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev); if(filters==NULL) - errorHandler("Memory allocation error\n"); + errorHandler((char*)"Memory allocation error\n"); if (wavelet_download == 1) { mzte_codec.m_iWvtUniform=wavelet_uniform = get_X_bits(1); if(wavelet_uniform) { @@ -331,7 +331,7 @@ /* decode the shape info from bitstream */ if(mzte_codec.m_iAlphaChannel) - noteProgress("Decoding Shape Information..."); + noteProgress((char*)"Decoding Shape Information..."); *Image = (PICTURE *)malloc(sizeof(PICTURE)*3); @@ -358,7 +358,7 @@ still_texture_object_start_code = get_X_bits(32); if (still_texture_object_start_code != STILL_TEXTURE_OBJECT_START_CODE) - errorHandler("Wrong texture_object_layer_start_code."); + errorHandler((char*)"Wrong texture_object_layer_start_code."); h_size += 32; mzte_codec.m_tiling_disable = get_X_bits(1); @@ -511,7 +511,7 @@ // hjlee 0901 filters = (FILTER **)malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev); if(filters==NULL) - errorHandler("Memory allocation error\n"); + errorHandler((char*)"Memory allocation error\n"); if (wavelet_download == 1) { mzte_codec.m_iWvtUniform=wavelet_uniform = get_X_bits(1); h_size += 1; // added by Sharp (99/2/16) @@ -619,7 +619,7 @@ /* decode the shape info from bitstream */ if(mzte_codec.m_iAlphaChannel) - noteProgress("Decoding Shape Information..."); + noteProgress((char*)"Decoding Shape Information..."); *Image = (PICTURE *)malloc(sizeof(PICTURE)*3); //begin: added by SL @Sarnoff (03/03/99) mzte_codec.m_iTargetSpatialLev = MIN(mzte_codec.m_iSpatialLev, mzte_codec.m_iTargetSpatialLev); @@ -643,7 +643,7 @@ filters); //modified by SL @Sarnoff (03/03/99) //begin: added by SL @Sarnoff (03/03/99) if(target_shape_layer > target_spatial_layer) { - noteWarning("Shape has less spatial layers than target,\n forced to use shape spatial layers.\n"); + noteWarning((char*)"Shape has less spatial layers than target,\n forced to use shape spatial layers.\n"); if(mzte_codec.m_iQuantType == 2) { for(i=0;i< mzte_codec.m_iSpatialLev;i++) { if( mzte_codec.m_lastWvtDecompInSpaLayer[i][0] > mzte_codec.m_iWvtDecmpLev -1 - target_shape_layer){ @@ -733,7 +733,7 @@ { Int col, err; - noteProgress("Decoding DC coefficients...."); + noteProgress((char*)"Decoding DC coefficients...."); for (col=0; colresidual_max); + noteDebug((char*)"resid_max=%d\n",snr_image->residual_max); } wavelet_higher_bands_decode_MQ(mzte_codec.m_iScanDirection); @@ -955,15 +955,15 @@ /* quantize and mark zerotree structure for AC coefficients */ if (decIQuantizeAC(col)) - errorHandler("decQuantizeAndMarkAC"); + errorHandler((char*)"decQuantizeAndMarkAC"); - noteDebug("max_root=%d max_valz=%d max_valnz=%d max_resi=%d", + noteDebug((char*)"max_root=%d max_valz=%d max_valnz=%d max_resi=%d", ROOT_MAX(col),VALZ_MAX(col),VALNZ_MAX(col), RESID_MAX(col)); /* Update states of ac coefficients */ if (decUpdateStateAC(col)) - errorHandler("decUpdateStateAC"); + errorHandler((char*)"decUpdateStateAC"); } } @@ -989,27 +989,27 @@ /*------- AC: Initialize QList Structure -------*/ if ((err=ztqQListInit())) - errorHandler("Allocating memory for QList information."); + errorHandler((char*)"Allocating memory for QList information."); // hjlee 0901 /* Initialize coeffs */ setSpatialLevelAndDimensions(0,0); if ((err=ztqInitAC(1,0))) - errorHandler("ztqInitAC"); + errorHandler((char*)"ztqInitAC"); if (mzte_codec.m_lastWvtDecompInSpaLayer[0][1]<0) setSpatialLevelAndDimensions(1,1); else setSpatialLevelAndDimensions(0,1); if ((err=ztqInitAC(1,1))) - errorHandler("ztqInitAC"); + errorHandler((char*)"ztqInitAC"); if (mzte_codec.m_lastWvtDecompInSpaLayer[0][2]<0) setSpatialLevelAndDimensions(1,2); else setSpatialLevelAndDimensions(0,2); if ((err=ztqInitAC(1,2))) - errorHandler("ztqInitAC"); + errorHandler((char*)"ztqInitAC"); /* Loop through spatial layers */ @@ -1067,7 +1067,7 @@ mzte_codec.m_iCurSpatialLev,mzte_codec.m_iCurSNRLev); #endif if ((bitfile=fopen(fname,"rb"))==NULL) - errorHandler("Can't open file '%s' for reading.",fname); + errorHandler((char*)"Can't open file '%s' for reading.",fname); /* initialize the buffer */ init_bit_packing_fp(bitfile,1); @@ -1080,12 +1080,12 @@ texture_spatial_layer_start_code = get_X_bits(32); if (texture_spatial_layer_start_code != TEXTURE_SPATIAL_LAYER_START_CODE) - errorHandler("Wrong texture_spatial_layer_start_code3 %x.", + errorHandler((char*)"Wrong texture_spatial_layer_start_code3 %x.", texture_spatial_layer_start_code); texture_spatial_layer_id = get_X_bits(5); if(texture_spatial_layer_id !=spa_lev) - errorHandler("Incorrect texture_spatial_layer_id"); + errorHandler((char*)"Incorrect texture_spatial_layer_id"); snr_scalability_levels = get_X_bits(5); mzte_codec.m_SPlayer[0].SNR_scalability_levels = snr_scalability_levels; @@ -1135,7 +1135,7 @@ /*------- DC: Open and initialize bitstream file -------*/ if ((bitfile=fopen(m_cInBitsFile,"rb"))==NULL) - errorHandler("Can't open file '%s' for reading.",m_cInBitsFile); + errorHandler((char*)"Can't open file '%s' for reading.",m_cInBitsFile); /* initialize variables */ init_bit_packing_fp(bitfile,1); @@ -1145,7 +1145,7 @@ wvtfilter = *pwvtfilter; // hjlee 0901 /*--------------- CREATE DATA STRUCTURES -----------------*/ - noteDetail("Creating and initializing data structures...."); + noteDetail((char*)"Creating and initializing data structures...."); mzte_codec.m_iColors = 3; mzte_codec.m_iBitDepth = 8; usemask = mzte_codec.m_iAlphaChannel = 0; @@ -1190,7 +1190,7 @@ } - noteDetail("Completed creating and initializing data structures."); + noteDetail((char*)"Completed creating and initializing data structures."); mzte_codec.m_iDCHeight = mzte_codec.m_iHeight >> mzte_codec.m_iWvtDecmpLev; mzte_codec.m_iDCWidth = mzte_codec.m_iWidth >> mzte_codec.m_iWvtDecmpLev; @@ -1222,7 +1222,7 @@ Width[col], Height[col], nLevels[col], &(wvtfilter[col==0?0:1])); if (ret!= DWT_OK) - errorHandler("DWT Error Code %d\n", ret); + errorHandler((char*)"DWT Error Code %d\n", ret); for (k=0,y=0; y> mzte_codec.m_iWvtDecmpLev; @@ -1427,7 +1427,7 @@ Width[col], Height[col], nLevels[col], &(wvtfilter[col==0?0:1])); if (ret!= DWT_OK) - errorHandler("DWT Error Code %d\n", ret); + errorHandler((char*)"DWT Error Code %d\n", ret); for (k=0,y=0; y> (col>0 ? 1 : 0); if ((picptr[col].data = (unsigned char *)malloc(sizeof(unsigned char)*h*w)) == NULL ) - errorHandler("Couldn't allocate memory to image data\n"); + errorHandler((char*)"Couldn't allocate memory to image data\n"); if ((picptr[col].mask = (unsigned char *)malloc(sizeof(unsigned char)*h*w)) == NULL ) - errorHandler("Couldn't allocate memory to image data\n"); + errorHandler((char*)"Couldn't allocate memory to image data\n"); } *Image = picptr; @@ -2109,7 +2109,7 @@ wvtfilter); if(target_shape_layer > target_spatial_layer) { - noteWarning("Shape has less spatial layers than target,\n forced to use shape spatial layers.\n"); + noteWarning((char*)"Shape has less spatial layers than target,\n forced to use shape spatial layers.\n"); if(mzte_codec.m_iQuantType == 2) { for(i=0;i< mzte_codec.m_iSpatialLev;i++) { if( mzte_codec.m_lastWvtDecompInSpaLayer[i][0] > mzte_codec.m_iWvtDecmpLev -1 - target_shape_layer){