[Sumover-dev] [svn commit] r4155 - in vic/branches/mpeg4/codec:
tmndec
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Fri May 23 17:41:37 BST 2008
Author: piers
Date: Fri May 23 17:41:36 2008
New Revision: 4155
Modified:
vic/branches/mpeg4/codec/h263/getgob.c
vic/branches/mpeg4/codec/h263/h263decoder.h
vic/branches/mpeg4/codec/h263/reconh263.c
vic/branches/mpeg4/codec/tmndec/getbits.c
vic/branches/mpeg4/codec/tmndec/getblk.c
vic/branches/mpeg4/codec/tmndec/gethdr.c
vic/branches/mpeg4/codec/tmndec/getpic.c
vic/branches/mpeg4/codec/tmndec/getvlc.c
vic/branches/mpeg4/codec/tmndec/global.h
vic/branches/mpeg4/codec/tmndec/recon.c
vic/branches/mpeg4/codec/tmndec/sac.c
vic/branches/mpeg4/codec/tmndec/tmndec.h
Log:
Patched these files so symbols don't clash with ffmpeg when the following libraries are built: libxvidcore.a and libmp3lame.a. Patch submitted by Brook Milligan 8nov07 - I patched them a while back but only just committed them.
Modified: vic/branches/mpeg4/codec/h263/getgob.c
==============================================================================
--- vic/branches/mpeg4/codec/h263/getgob.c (original)
+++ vic/branches/mpeg4/codec/h263/getgob.c Fri May 23 17:41:36 2008
@@ -1500,8 +1500,8 @@
}
/* chroma rounding (table 16/H.263) */
- BMVx = SGN(xvec)*(roundtab[abs(xvec)%16]+(abs(xvec)/16)*2);
- BMVy = SGN(yvec)*(roundtab[abs(yvec)%16]+(abs(yvec)/16)*2);
+ BMVx = SGN(xvec)*(vic_roundtab[abs(xvec)%16]+(abs(xvec)/16)*2);
+ BMVy = SGN(yvec)*(vic_roundtab[abs(yvec)%16]+(abs(yvec)/16)*2);
}
}
else {
@@ -1522,8 +1522,8 @@
yvec *= 4;
/* chroma rounding (table 16/H.263) */
- BMVx = SGN(xvec)*(roundtab[abs(xvec)%16] +(abs(xvec)/16)*2);
- BMVy = SGN(yvec)*(roundtab[abs(yvec)%16] +(abs(yvec)/16)*2);
+ BMVx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] +(abs(xvec)/16)*2);
+ BMVy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] +(abs(yvec)/16)*2);
}
}
Modified: vic/branches/mpeg4/codec/h263/h263decoder.h
==============================================================================
--- vic/branches/mpeg4/codec/h263/h263decoder.h (original)
+++ vic/branches/mpeg4/codec/h263/h263decoder.h Fri May 23 17:41:36 2008
@@ -62,7 +62,7 @@
} H263Global;
#ifdef notextern
-int roundtab[16]
+int vic_roundtab[16]
#ifdef DEFINE_GLOBALS
= {0,0,0,1,1,1,1,1,1,1,1,1,1,1,2,2}
#endif
@@ -74,7 +74,7 @@
#endif
;
#else
-extern int roundtab[];
+extern int vic_roundtab[];
extern int bquant_tab[];
#endif
Modified: vic/branches/mpeg4/codec/h263/reconh263.c
==============================================================================
--- vic/branches/mpeg4/codec/h263/reconh263.c (original)
+++ vic/branches/mpeg4/codec/h263/reconh263.c Fri May 23 17:41:36 2008
@@ -99,11 +99,11 @@
sum = h263Data->MV[0][1][y][x]+h263Data->MV[0][2][y][x]+
h263Data->MV[0][3][y][x]+h263Data->MV[0][4][y][x];
- dx = SGN(sum)*(roundtab[abs(sum)%16] + (abs(sum)/16)*2);
+ dx = SGN(sum)*(vic_roundtab[abs(sum)%16] + (abs(sum)/16)*2);
sum = h263Data->MV[1][1][y][x]+h263Data->MV[1][2][y][x]+
h263Data->MV[1][3][y][x]+h263Data->MV[1][4][y][x];
- dy = SGN(sum)*(roundtab[abs(sum)%16] + (abs(sum)/16)*2);
+ dy = SGN(sum)*(vic_roundtab[abs(sum)%16] + (abs(sum)/16)*2);
}
else {
@@ -156,8 +156,8 @@
}
/* chroma rounding (table 16/H.263) */
- dx = SGN(xvec)*(roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
- dy = SGN(yvec)*(roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
+ dx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
+ dy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
lx>>=1;bx>>=1; lx2>>=1;
by>>=1;
@@ -180,8 +180,8 @@
yvec = 4*dy;
/* chroma rounding (table 16/H.263) */
- dx = SGN(xvec)*(roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
- dy = SGN(yvec)*(roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
+ dx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
+ dy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
/* Chroma */
recon_comp(src[1],h263Data->bframe[1], lx,lx2,w,h,bx,by,dx,dy,1);
@@ -203,8 +203,8 @@
yvec = 4*dy;
/* chroma rounding (table 16/H.263) */
- dx = SGN(xvec)*(roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
- dy = SGN(yvec)*(roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
+ dx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
+ dy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
/* Chroma */
recon_comp(src[1],h263Data->bframe[1], lx,lx2,w,h,bx,by,dx,dy,1);
Modified: vic/branches/mpeg4/codec/tmndec/getbits.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/getbits.c (original)
+++ vic/branches/mpeg4/codec/tmndec/getbits.c Fri May 23 17:41:36 2008
@@ -158,7 +158,7 @@
unsigned int getbits1 ()
{
- return getbits (1);
+ return vic_getbits (1);
}
@@ -176,7 +176,7 @@
/* return next n bits (right adjusted) */
-unsigned int getbits (int n)
+unsigned int vic_getbits (int n)
{
unsigned int l;
Modified: vic/branches/mpeg4/codec/tmndec/getblk.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/getblk.c (original)
+++ vic/branches/mpeg4/codec/tmndec/getblk.c Fri May 23 17:41:36 2008
@@ -157,21 +157,21 @@
last = getbits1 ();
store_code[coeff_ind].last = last;
- i += run = getbits (6);
+ i += run = vic_getbits (6);
store_code[coeff_ind].run = run;
- level = getbits (8);
+ level = vic_getbits (8);
store_code[coeff_ind].level = level;
if (level == 128 && modified_quantization_mode)
{
- level = getbits (11);
+ level = vic_getbits (11);
store_code[coeff_ind].extended_level = level;
}
} else
{
- store_code[coeff_ind].sign = getbits (1);
+ store_code[coeff_ind].sign = vic_getbits (1);
i += run;
}
coeff_ind += 1;
@@ -344,13 +344,13 @@
fprintf (trace_file, " ");
printbits (showbits (6), 6, 6);
}
- i += run = getbits (6);
+ i += run = vic_getbits (6);
if (trace)
{
fprintf (trace_file, " ");
printbits (showbits (8), 8, 8);
}
- level = getbits (8);
+ level = vic_getbits (8);
if ((sign = (level >= 128)))
val = 256 - level;
@@ -360,7 +360,7 @@
if (level == 128 && modified_quantization_mode)
{
/* extended escape code was received */
- level = getbits (11);
+ level = vic_getbits (11);
level = (level >> 6 & 0x001F) | level << 5;
/* correctly set the sign */
level = (level << (sizeof (int) * 8 - 11)) >> (sizeof (int) * 8 - 11);
@@ -374,7 +374,7 @@
{
i += run;
val = level;
- sign = getbits (1);
+ sign = vic_getbits (1);
if (trace)
fprintf (trace_file, "%d", sign);
}
Modified: vic/branches/mpeg4/codec/tmndec/gethdr.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/gethdr.c (original)
+++ vic/branches/mpeg4/codec/tmndec/gethdr.c Fri May 23 17:41:36 2008
@@ -78,8 +78,8 @@
/* look for startcode */
startcode ();
- code = getbits (PSC_LENGTH);
- gob = getbits (5);
+ code = vic_getbits (PSC_LENGTH);
+ gob = vic_getbits (5);
if (gob == SE_CODE)
return 0;
if (gob == 0)
@@ -131,7 +131,7 @@
pos = ld->bitcnt;
prev_plus_P_temp_ref = temp_ref;
- temp_ref = getbits (8);
+ temp_ref = vic_getbits (8);
if (trace)
{
fprintf (trace_file, "\nTR: ");
@@ -140,19 +140,19 @@
if (trd < 0)
trd += 256;
- tmp = getbits (1); /* always "1" */
+ tmp = vic_getbits (1); /* always "1" */
if (trace)
fprintf (trace_file, "\nSpare: %d", tmp);
if (!tmp)
if (!quiet)
printf ("warning: spare in picture header should be \"1\"\n");
- tmp = getbits (1); /* always "0" */
+ tmp = vic_getbits (1); /* always "0" */
if (trace)
fprintf (trace_file, "\nH.261 distinction bit: %d", tmp);
if (tmp)
if (!quiet)
printf ("warning: H.261 distinction bit should be \"0\"\n");
- tmp = getbits (1); /* split_screen_indicator */
+ tmp = vic_getbits (1); /* split_screen_indicator */
if (trace)
fprintf (trace_file, "\nsplit_screen_indicator: %d", tmp);
if (tmp)
@@ -161,20 +161,20 @@
printf ("error: split-screen not supported in this version\n");
exit (-1);
}
- tmp = getbits (1); /* document_camera_indicator */
+ tmp = vic_getbits (1); /* document_camera_indicator */
if (trace)
fprintf (trace_file, "\ndocument_camera_indicator: %d", tmp);
if (tmp)
if (!quiet)
printf ("warning: document camera indicator not supported in this version\n");
- tmp = getbits (1); /* freeze_picture_release */
+ tmp = vic_getbits (1); /* freeze_picture_release */
if (trace)
fprintf (trace_file, "\nfreeze_picture_release: %d", tmp);
if (tmp)
if (!quiet)
printf ("warning: frozen picture not supported in this version\n");
- tmp = getbits (3);
+ tmp = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\nsource_format: ");
@@ -186,7 +186,7 @@
if (trace)
fprintf (trace_file, "\n----------EXTENDED_PTYPE----------");
plus_type = 1;
- UFEP = getbits (3);
+ UFEP = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\nUFEP: ");
@@ -197,7 +197,7 @@
if (trace)
fprintf (trace_file, "\n----------OPTIONAL PLUS PTYPE----------");
source_format_old = source_format;
- source_format = getbits (3);
+ source_format = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\nsource_format: ");
@@ -205,7 +205,7 @@
}
/* optional custom picture clock frequency */
- optional_custom_PCF = getbits (1);
+ optional_custom_PCF = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\noptional_custom_PCF: ");
@@ -217,20 +217,20 @@
printf ("error: Optional custom picture clock frequency is not supported in this version\n");
exit (-1);
}
- mv_outside_frame = getbits (1);
+ mv_outside_frame = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nmv_outside_frame: ");
printbits (mv_outside_frame, 1, 1);
}
long_vectors = (mv_outside_frame ? 1 : 0);
- syntax_arith_coding = getbits (1);
+ syntax_arith_coding = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nsyntax_arith_coding: ");
printbits (syntax_arith_coding, 1, 1);
}
- adv_pred_mode = getbits (1);
+ adv_pred_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nadv_pred_mode: ");
@@ -240,13 +240,13 @@
overlapping_MC = (adv_pred_mode ? 1 : 0);
use_4mv = (adv_pred_mode ? 1 : 0);
pb_frame = 0;
- advanced_intra_coding = getbits (1);
+ advanced_intra_coding = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nadvanced_intra_coding: ");
printbits (advanced_intra_coding, 1, 1);
}
- deblocking_filter_mode = getbits (1);
+ deblocking_filter_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\ndeblocking_filter_mode: ");
@@ -255,7 +255,7 @@
mv_outside_frame = (deblocking_filter_mode ? 1 : mv_outside_frame);
use_4mv = (deblocking_filter_mode ? 1 : use_4mv);
- slice_structured_mode = getbits (1);
+ slice_structured_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nslice_structured_mode: ");
@@ -267,7 +267,7 @@
printf ("error: Slice structured mode is not supported in this version\n");
exit (-1);
}
- reference_picture_selection_mode = getbits (1);
+ reference_picture_selection_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nreference_picture_selection_mode: ");
@@ -281,7 +281,7 @@
exit (-1);
}
#endif
- independently_segmented_decoding_mode = getbits (1);
+ independently_segmented_decoding_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nindependently_segmented_decoding_mode: ");
@@ -293,19 +293,19 @@
printf ("error: Independently segmented decoding mode is not supported in this version\n");
exit (-1);
}
- alternative_inter_VLC_mode = getbits (1);
+ alternative_inter_VLC_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nalternative_inter_VLC_mode: ");
printbits (alternative_inter_VLC_mode, 1, 1);
}
- modified_quantization_mode = getbits (1);
+ modified_quantization_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nmodified_quantization_mode: ");
printbits (modified_quantization_mode, 1, 1);
}
- tmp = getbits (4);
+ tmp = vic_getbits (4);
if (trace)
{
fprintf (trace_file, "\nspare, reserve, reserve, reserve: ");
@@ -346,7 +346,7 @@
/* MMPTYPE */
if (trace)
fprintf (trace_file, "\n----------MANDATORY PLUS PTYPE----------");
- pict_type = getbits (3);
+ pict_type = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\npict_type: ");
@@ -372,7 +372,7 @@
trd = temp_ref - prev_non_disposable_temp_ref;
}
- reference_picture_resampling_mode = getbits (1);
+ reference_picture_resampling_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nreference_picture_resampling_mode: ");
@@ -384,7 +384,7 @@
printf ("error: Reference picture resampling mode is not supported in this version\n");
exit (-1);
}
- reduced_resolution_update_mode = getbits (1);
+ reduced_resolution_update_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nreduced_resolution_update_mode: ");
@@ -396,7 +396,7 @@
printf ("error: Reduced resolution update mode is not supported in this version\n");
exit (-1);
}
- rtype = getbits (1); /* rounding type */
+ rtype = vic_getbits (1); /* rounding type */
if (trace)
{
fprintf (trace_file, "\nrounding_type: ");
@@ -407,7 +407,7 @@
fprintf (trace_file, "\nrtype: ");
printbits (rtype, 1, 1);
}
- tmp = getbits (3);
+ tmp = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\nreserve, reserve, spare: ");
@@ -426,7 +426,7 @@
exit (-1);
}
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nCPM: ");
@@ -444,7 +444,7 @@
/* Read custom picture format */
if (trace)
fprintf (trace_file, "\ncustom picture format \n");
- CP_PAR_code = getbits (4);
+ CP_PAR_code = vic_getbits (4);
if (trace)
{
fprintf (trace_file, "\nCP_PAR_code: ");
@@ -458,14 +458,14 @@
}
exit(-1);
}
- tmp=getbits (9);
+ tmp=vic_getbits (9);
horizontal_size = (tmp + 1 ) * 4;
if (trace)
{
fprintf (trace_file, "\nCP_picture_width_indication: ");
printbits (tmp, 9, 9);
}
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nspare: ");
@@ -477,7 +477,7 @@
printf ("error: The 14th bit of Custom Picture Format(CPFMT) should be 1\n");
exit (-1);
}
- tmp = getbits (8);
+ tmp = vic_getbits (8);
vertical_size = tmp * 4;
if (trace)
{
@@ -495,8 +495,8 @@
if (CP_PAR_code == EXTENDED_PAR)
{
- PAR_width = getbits (8);
- PAR_height = getbits (8);
+ PAR_width = vic_getbits (8);
+ PAR_height = vic_getbits (8);
}
}
@@ -532,13 +532,13 @@
fprintf (trace_file, "\noptional_custom_PCF \n");
if (UFEP)
{
- clock_conversion_code = getbits (1);
+ clock_conversion_code = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nclock_conversion_code: ");
printbits (clock_conversion_code, 1, 1);
}
- clock_divisor = getbits (7);
+ clock_divisor = vic_getbits (7);
if (trace)
{
fprintf (trace_file, "\nclock_divisor: ");
@@ -547,7 +547,7 @@
CP_clock_frequency = (int) (1800 / ((float) clock_divisor * (8 + clock_conversion_code)) * 1000);
}
/* regardless of the value of UFEP */
- extended_temporal_reference = getbits (2);
+ extended_temporal_reference = vic_getbits (2);
if (trace)
{
fprintf (trace_file, "\nextended_temporal_reference: ");
@@ -568,13 +568,13 @@
}
if (UFEP && slice_structured_mode)
{
- SSS_rectangular_slices = getbits (1);
+ SSS_rectangular_slices = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nSSS_rectangular_slices: ");
printbits (SSS_rectangular_slices, 1, 1);
}
- SSS_arbitary_slice_ordering = getbits (1);
+ SSS_arbitary_slice_ordering = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nSSS_arbitary_slice_ordering: ");
@@ -585,7 +585,7 @@
if ((pict_type == PCT_B) || (pict_type == PCT_EI) || (pict_type == PCT_EP))
{
/* optional temporal, SNR and spatial scalability mode in use */
- enhancement_layer_num = getbits (4);
+ enhancement_layer_num = vic_getbits (4);
if (trace)
{
fprintf (trace_file, "\nenhancement_layer_num: ");
@@ -593,7 +593,7 @@
}
if (UFEP)
{
- reference_layer_number = getbits (4);
+ reference_layer_number = vic_getbits (4);
if (trace)
{
fprintf (trace_file, "\nreference_layer_number: ");
@@ -632,14 +632,14 @@
{
if (UFEP)
{
- MF_of_reference_picture_selection = getbits (3);
+ MF_of_reference_picture_selection = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\nMF_of_reference_picture_selection: ");
printbits (MF_of_reference_picture_selection, 3, 3);
}
}
- TRPI = getbits (1);
+ TRPI = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nTRPI: ");
@@ -648,7 +648,7 @@
if (TRPI)
{
/* temporal reference for prediction exists */
- temporal_reference_for_prediction = getbits (10);
+ temporal_reference_for_prediction = vic_getbits (10);
if (trace)
{
fprintf (trace_file, "\ntemporal_reference_for_prediction: ");
@@ -656,8 +656,8 @@
}
}
/* draft20: 1=yes, 01=no */
- BCI = getbits (1);
- if (!BCI) getbits(1);
+ BCI = vic_getbits (1);
+ if (!BCI) vic_getbits(1);
if (trace)
{
fprintf (trace_file, "\nBCI: ");
@@ -679,7 +679,7 @@
exit (-1);
}
- pic_quant = getbits (5);
+ pic_quant = vic_getbits (5);
quant = pic_quant;
if (trace)
@@ -711,26 +711,26 @@
trd = temp_ref - prev_plus_P_temp_ref;
- pict_type = getbits (1);
+ pict_type = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\npict_type: ");
printbits (pict_type, 1, 1);
}
- mv_outside_frame = getbits (1);
+ mv_outside_frame = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nmv_outside_frame: ");
printbits (mv_outside_frame, 1, 1);
}
long_vectors = (mv_outside_frame ? 1 : 0);
- syntax_arith_coding = getbits (1);
+ syntax_arith_coding = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nsyntax_arith_coding: ");
printbits (syntax_arith_coding, 1, 1);
}
- adv_pred_mode = getbits (1);
+ adv_pred_mode = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nadv_pred_mode: ");
@@ -739,14 +739,14 @@
mv_outside_frame = (adv_pred_mode ? 1 : mv_outside_frame);
overlapping_MC = (adv_pred_mode ? 1 : 0);
use_4mv = (adv_pred_mode ? 1 : 0);
- pb_frame = getbits (1);
+ pb_frame = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\npb_frame: ");
printbits (pb_frame, 1, 1);
}
- pic_quant = getbits (5);
+ pic_quant = vic_getbits (5);
quant = pic_quant;
if (trace)
@@ -755,7 +755,7 @@
printbits (quant, 5, 5);
}
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\nCPM: ");
@@ -773,7 +773,7 @@
{
if (optional_custom_PCF)
{
- trb = getbits (5);
+ trb = vic_getbits (5);
if (trace)
{
fprintf (trace_file, "\ntrb: ");
@@ -781,7 +781,7 @@
}
} else
{
- trb = getbits (3);
+ trb = vic_getbits (3);
if (trace)
{
fprintf (trace_file, "\ntrb: ");
@@ -789,7 +789,7 @@
}
}
- bquant = getbits (2);
+ bquant = vic_getbits (2);
if (trace)
{
fprintf (trace_file, "\nbquant: ");
@@ -805,7 +805,7 @@
doframerate (0);
#endif
- pei = getbits (1);
+ pei = vic_getbits (1);
if (trace)
{
fprintf (trace_file, "\npei: ");
@@ -816,8 +816,8 @@
if (pei)
{
/* extra info for possible future backward compatible additions */
- getbits (8); /* not used */
- pei = getbits (1);
+ vic_getbits (8); /* not used */
+ pei = vic_getbits (1);
if (pei)
goto pspare; /* keep on reading pspare until pei=0 */
}
Modified: vic/branches/mpeg4/codec/tmndec/getpic.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/getpic.c (original)
+++ vic/branches/mpeg4/codec/tmndec/getpic.c Fri May 23 17:41:36 2008
@@ -404,7 +404,7 @@
}
/* GFID is not allowed to change unless PTYPE in picture header
* changes */
- gfid = getbits (2);
+ gfid = vic_getbits (2);
if (trace)
{
fprintf (trace_file, "gfid: ");
@@ -414,7 +414,7 @@
* value to determine whether a picture header where the PTYPE
* has changed, has been lost */
- quant = getbits (5);
+ quant = vic_getbits (5);
if (trace)
{
fprintf (trace_file, "quant: ");
@@ -553,9 +553,9 @@
{
/* using VLC */
if (!showbits (1))
- INTRA_AC_DC = getbits (1);
+ INTRA_AC_DC = vic_getbits (1);
else
- INTRA_AC_DC = getbits (2);
+ INTRA_AC_DC = vic_getbits (2);
}
if (trace)
fprintf (trace_file, "INTRA_AC_DC: %d\n", INTRA_AC_DC);
@@ -602,7 +602,7 @@
}
}
else
- CBPB = getbits (6);
+ CBPB = vic_getbits (6);
if (trace)
fprintf (trace_file, "CBPB = %d\n", CBPB);
@@ -672,7 +672,7 @@
{
if (!modified_quantization_mode)
{
- DQUANT = getbits (2);
+ DQUANT = vic_getbits (2);
quant += DQ_tab[DQUANT];
if (trace)
{
@@ -683,11 +683,11 @@
}
else
{
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (tmp)
{
/* only one more additional bit was sent */
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (tmp)
{
/* second bit of quant is 1 */
@@ -710,7 +710,7 @@
{
/* five additional bits were sent as
* DQUANT */
- DQUANT = getbits (5);
+ DQUANT = vic_getbits (5);
quant = DQUANT;
if (trace)
{
@@ -1106,7 +1106,7 @@
}
else
{
- bp[0] = getbits (8);
+ bp[0] = vic_getbits (8);
if (trace)
{
fprintf (trace_file, "DC[%d]: (", comp);
@@ -1325,7 +1325,7 @@
}
/* GFID is not allowed to change unless PTYPE in picture header
* changes */
- gfid = getbits (2);
+ gfid = vic_getbits (2);
if (trace)
{
fprintf (trace_file, "gfid: ");
@@ -1335,7 +1335,7 @@
* value to determine whether a picture header where the PTYPE
* has changed, has been lost */
- quant = getbits (5);
+ quant = vic_getbits (5);
if (trace)
{
fprintf (trace_file, "quant: ");
@@ -1397,9 +1397,9 @@
{
/* get INTRA_AC_DC mode for annex I */
if (!showbits (1))
- INTRA_AC_DC = getbits (1);
+ INTRA_AC_DC = vic_getbits (1);
else
- INTRA_AC_DC = getbits (2);
+ INTRA_AC_DC = vic_getbits (2);
if (trace)
{
@@ -1465,7 +1465,7 @@
{
if (!modified_quantization_mode)
{
- DQUANT = getbits (2);
+ DQUANT = vic_getbits (2);
quant += DQ_tab[DQUANT];
if (trace)
{
@@ -1476,10 +1476,10 @@
}
else
{
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (tmp)
{ /* only one more additional bit was sent */
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (tmp)
{ /* second bit of quant is 1 */
DQUANT = change_of_quant_tab_11[quant];
@@ -1498,7 +1498,7 @@
else
{ /* five additional bits were sent as
* DQUANT */
- DQUANT = getbits (5);
+ DQUANT = vic_getbits (5);
quant = DQUANT;
if (trace)
{
@@ -1810,7 +1810,7 @@
{
/* Intra (except in advanced intra coding mode) */
bp = ld->block[comp];
- bp[0] = getbits (8);
+ bp[0] = vic_getbits (8);
if (trace)
{
fprintf (trace_file, "DC[%d]: (", comp);
@@ -1991,7 +1991,7 @@
}
/* GFID is not allowed to change unless PTYPE in picture header
* changes */
- gfid = getbits (2);
+ gfid = vic_getbits (2);
if (trace)
{
fprintf (trace_file, "gfid: ");
@@ -2001,7 +2001,7 @@
* value to determine whether a picture header where the PTYPE
* has changed, has been lost */
- quant = getbits (5);
+ quant = vic_getbits (5);
if (trace)
{
fprintf (trace_file, "quant: ");
@@ -2063,9 +2063,9 @@
{
/* get INTRA_AC_DC mode for annex I */
if (!showbits (1))
- INTRA_AC_DC = getbits (1);
+ INTRA_AC_DC = vic_getbits (1);
else
- INTRA_AC_DC = getbits (2);
+ INTRA_AC_DC = vic_getbits (2);
if (trace)
{
@@ -2136,7 +2136,7 @@
{
if (!modified_quantization_mode)
{
- DQUANT = getbits (2);
+ DQUANT = vic_getbits (2);
quant += DQ_tab[DQUANT];
if (trace)
{
@@ -2147,10 +2147,10 @@
}
else
{
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (tmp)
{ /* only one more additional bit was sent */
- tmp = getbits (1);
+ tmp = vic_getbits (1);
if (tmp)
{ /* second bit of quant is 1 */
DQUANT = change_of_quant_tab_11[quant];
@@ -2169,7 +2169,7 @@
else
{ /* five additional bits were sent as
* DQUANT */
- DQUANT = getbits (5);
+ DQUANT = vic_getbits (5);
quant = DQUANT;
if (trace)
{
@@ -2405,7 +2405,7 @@
{
/* Intra (except in advanced intra coding mode) */
bp = ld->block[comp];
- bp[0] = getbits (8);
+ bp[0] = vic_getbits (8);
if (trace)
{
fprintf (trace_file, "DC[%d]: (", comp);
@@ -2615,8 +2615,8 @@
}
/* chroma rounding (table 16/H.263) */
- BMVx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
- BMVy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+ BMVx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+ BMVy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
}
} else
{
@@ -2638,8 +2638,8 @@
yvec *= 4;
/* chroma rounding (table 16/H.263) */
- BMVx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
- BMVy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+ BMVx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+ BMVy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
}
}
Modified: vic/branches/mpeg4/codec/tmndec/getvlc.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/getvlc.c (original)
+++ vic/branches/mpeg4/codec/tmndec/getvlc.c Fri May 23 17:41:36 2008
@@ -150,11 +150,11 @@
fprintf (trace_file, "1): 0\n");
return 0;
}
- code = 2 + getbits(1);
- while (getbits(1))
+ code = 2 + vic_getbits(1);
+ while (vic_getbits(1))
{
code <<= 1;
- code += getbits(1);
+ code += vic_getbits(1);
}
sign = code & 1;
code >>= 1;
@@ -398,7 +398,7 @@
if (pict_type == PCT_IPB)
{
- code = getbits (1);
+ code = vic_getbits (1);
if (code == 0)
{
MODB = PBMODE_BIDIR_PRED;
@@ -407,7 +407,7 @@
}
else
{
- code=getbits (1);
+ code=vic_getbits (1);
if (code==0)
{
MODB = PBMODE_CBPB_BIDIR_PRED;
@@ -416,7 +416,7 @@
}
else
{
- code=getbits (1);
+ code=vic_getbits (1);
if (code==0)
{
MODB = PBMODE_FRW_PRED;
@@ -425,7 +425,7 @@
}
else
{
- code=getbits (1);
+ code=vic_getbits (1);
if (code==0)
{
MODB = PBMODE_CBPB_FRW_PRED;
@@ -434,7 +434,7 @@
}
else
{
- code=getbits (1);
+ code=vic_getbits (1);
if (code==0)
{
MODB = PBMODE_BCKW_PRED;
Modified: vic/branches/mpeg4/codec/tmndec/global.h
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/global.h (original)
+++ vic/branches/mpeg4/codec/tmndec/global.h Fri May 23 17:41:36 2008
@@ -84,7 +84,7 @@
unsigned int showbits _ANSI_ARGS_ ((int n));
unsigned int getbits1 _ANSI_ARGS_ ((void));
void flushbits _ANSI_ARGS_ ((int n));
-unsigned int getbits _ANSI_ARGS_ ((int n));
+unsigned int vic_getbits _ANSI_ARGS_ ((int n));
/* getblk.c */
void getblock _ANSI_ARGS_ ((int comp, int mode, int INTRA_AC_DC, int Mode));
@@ -426,7 +426,7 @@
#endif
;
-EXTERN int roundtab[16]
+EXTERN int vic_roundtab[16]
#ifdef GLOBAL
= {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2}
#endif
Modified: vic/branches/mpeg4/codec/tmndec/recon.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/recon.c (original)
+++ vic/branches/mpeg4/codec/tmndec/recon.c Fri May 23 17:41:36 2008
@@ -152,10 +152,10 @@
{
sum = MV[0][1][y][x] + MV[0][2][y][x] + MV[0][3][y][x] + MV[0][4][y][x];
- dx = sign (sum) * (roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
+ dx = sign (sum) * (vic_roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
sum = MV[1][1][y][x] + MV[1][2][y][x] + MV[1][3][y][x] + MV[1][4][y][x];
- dy = sign (sum) * (roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
+ dy = sign (sum) * (vic_roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
} else
{
@@ -272,8 +272,8 @@
}
/* chroma rounding (table 16/H.263) */
- dx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
- dy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+ dx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+ dy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
lx >>= 1;
bx >>= 1;
@@ -304,8 +304,8 @@
yvec = 4 * dy;
/* chroma rounding (table 16/H.263) */
- dx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
- dy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+ dx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+ dy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
/* Chroma */
recon_comp (src[1], bframe[1], lx, lx2, w, h, bx, by, dx, dy, 1);
Modified: vic/branches/mpeg4/codec/tmndec/sac.c
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/sac.c (original)
+++ vic/branches/mpeg4/codec/tmndec/sac.c Fri May 23 17:41:36 2008
@@ -191,7 +191,7 @@
{ /* check for startcode in Arithmetic
* Decoder FIFO */
- bit = getbits (1);
+ bit = vic_getbits (1);
if (zerorun > 13)
{ /* if number of consecutive zeros = 14 */
@@ -204,7 +204,7 @@
{ /* if there is a 'stuffing bit present */
if (trace)
fprintf (trace_file, "Removing Startcode Emulation Prevention bit \n");
- bit = getbits (1); /* overwrite the last bit */
+ bit = vic_getbits (1); /* overwrite the last bit */
zerorun = !bit; /* zerorun=1 if bit is a '0' */
}
} else
Modified: vic/branches/mpeg4/codec/tmndec/tmndec.h
==============================================================================
--- vic/branches/mpeg4/codec/tmndec/tmndec.h (original)
+++ vic/branches/mpeg4/codec/tmndec/tmndec.h Fri May 23 17:41:36 2008
@@ -170,4 +170,4 @@
#ifdef WINDOWS
int initDisplay (int pels, int lines);
int closeDisplay ();
-#endif
\ No newline at end of file
+#endif
More information about the Sumover-dev
mailing list