summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Torri <storri@users.sourceforge.net>2002-10-22 06:34:01 +0000
committerStephen Torri <storri@users.sourceforge.net>2002-10-22 06:34:01 +0000
commit147b8adb5ea35892f2f83325e53f4f54aa85f74a (patch)
tree48ab6c1cbfa16a223b03ddc93c93133582a342d3
parentaa2c97288d8fcfe78801cbfc65305dc8595c977e (diff)
downloadxine-lib-147b8adb5ea35892f2f83325e53f4f54aa85f74a.tar.gz
xine-lib-147b8adb5ea35892f2f83325e53f4f54aa85f74a.tar.bz2
Changed comments to standard /* ... */
CVS patchset: 2932 CVS date: 2002/10/22 06:34:01
Diffstat
-rw-r--r--src/libffmpeg/libavcodec/common.c34
-rw-r--r--src/libffmpeg/libavcodec/dsputil.c120
-rw-r--r--src/libffmpeg/libavcodec/eval.c50
-rw-r--r--src/libffmpeg/libavcodec/h263.c782
-rw-r--r--src/libffmpeg/libavcodec/mpegvideo.c320
5 files changed, 653 insertions, 653 deletions
diff --git a/src/libffmpeg/libavcodec/common.c b/src/libffmpeg/libavcodec/common.c
index fde12d927..00324edf3 100644
--- a/src/libffmpeg/libavcodec/common.c
+++ b/src/libffmpeg/libavcodec/common.c
@@ -27,7 +27,7 @@ const UINT8 ff_sqrt_tab[128]={
9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,11
};
-void init_put_bits(PutBitContext *s,
+void init_put_bits(PutBitContext *s,
UINT8 *buffer, int buffer_size,
void *opaque,
void (*write_data)(void *, UINT8 *, int))
@@ -35,14 +35,14 @@ void init_put_bits(PutBitContext *s,
s->buf = buffer;
s->buf_end = s->buf + buffer_size;
s->data_out_size = 0;
- if(write_data!=NULL)
+ if(write_data!=NULL)
{
- fprintf(stderr, "write Data callback is not supported\n");
+ fprintf(stderr, "write Data callback is not supported\n");
}
#ifdef ALT_BITSTREAM_WRITER
s->index=0;
((uint32_t*)(s->buf))[0]=0;
-// memset(buffer, 0, buffer_size);
+/* memset(buffer, 0, buffer_size); */
#else
s->buf_ptr = s->buf;
s->bit_left=32;
@@ -146,7 +146,7 @@ void init_get_bits(GetBitContext *s,
{
OPEN_READER(re, s)
UPDATE_CACHE(re, s)
-// UPDATE_CACHE(re, s)
+/* UPDATE_CACHE(re, s) */
CLOSE_READER(re, s)
}
#ifdef A32_BITSTREAM_READER
@@ -170,7 +170,7 @@ int check_marker(GetBitContext *s, char *msg)
/* VLC decoding */
-//#define DEBUG_VLC
+/* #define DEBUG_VLC */
#define GET_DATA(v, table, i, wrap, size) \
{\
@@ -225,8 +225,8 @@ static int build_table(VLC *vlc, int table_nb_bits,
table = &vlc->table[table_index];
for(i=0;i<table_size;i++) {
- table[i][1] = 0; //bits
- table[i][0] = -1; //codes
+ table[i][1] = 0; /* bits */
+ table[i][0] = -1; /* codes */
}
/* first pass: map codes and compute auxillary table sizes */
@@ -255,8 +255,8 @@ static int build_table(VLC *vlc, int table_nb_bits,
fprintf(stderr, "incorrect codes\n");
exit(1);
}
- table[j][1] = n; //bits
- table[j][0] = i; //code
+ table[j][1] = n; /* bits */
+ table[j][0] = i; /* code */
j++;
}
} else {
@@ -267,22 +267,22 @@ static int build_table(VLC *vlc, int table_nb_bits,
j, n);
#endif
/* compute table size */
- n1 = -table[j][1]; //bits
+ n1 = -table[j][1]; /* bits */
if (n > n1)
n1 = n;
- table[j][1] = -n1; //bits
+ table[j][1] = -n1; /* bits */
}
}
}
/* second pass : fill auxillary tables recursively */
for(i=0;i<table_size;i++) {
- n = table[i][1]; //bits
+ n = table[i][1]; /* bits */
if (n < 0) {
n = -n;
if (n > table_nb_bits) {
n = table_nb_bits;
- table[i][1] = -n; //bits
+ table[i][1] = -n; /* bits */
}
index = build_table(vlc, n, nb_codes,
bits, bits_wrap, bits_size,
@@ -293,7 +293,7 @@ static int build_table(VLC *vlc, int table_nb_bits,
return -1;
/* note: realloc has been done, so reload tables */
table = &vlc->table[table_index];
- table[i][0] = index; //code
+ table[i][0] = index; /* code */
}
}
return table_index;
@@ -305,7 +305,7 @@ static int build_table(VLC *vlc, int table_nb_bits,
'nb_bits' set thee decoding table size (2^nb_bits) entries. The
bigger it is, the faster is the decoding. But it should not be too
big to save memory and L1 cache. '9' is a good compromise.
-
+
'nb_codes' : number of vlcs codes
'bits' : table which gives the size (in bits) of each vlc code.
@@ -319,7 +319,7 @@ static int build_table(VLC *vlc, int table_nb_bits,
or 'codes' tables.
'wrap' and 'size' allows to use any memory configuration and types
- (byte/word/long) to store the 'bits' and 'codes' tables.
+ (byte/word/long) to store the 'bits' and 'codes' tables.
*/
int init_vlc(VLC *vlc, int nb_bits, int nb_codes,
const void *bits, int bits_wrap, int bits_size,
diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c
index eb8592352..f63b61db3 100644
--- a/src/libffmpeg/libavcodec/dsputil.c
+++ b/src/libffmpeg/libavcodec/dsputil.c
@@ -72,24 +72,24 @@ UINT16 __align8 inv_zigzag_direct16[64];
UINT8 zigzag_direct_noperm[64];
UINT8 ff_alternate_horizontal_scan[64] = {
- 0, 1, 2, 3, 8, 9, 16, 17,
+ 0, 1, 2, 3, 8, 9, 16, 17,
10, 11, 4, 5, 6, 7, 15, 14,
- 13, 12, 19, 18, 24, 25, 32, 33,
+ 13, 12, 19, 18, 24, 25, 32, 33,
26, 27, 20, 21, 22, 23, 28, 29,
- 30, 31, 34, 35, 40, 41, 48, 49,
+ 30, 31, 34, 35, 40, 41, 48, 49,
42, 43, 36, 37, 38, 39, 44, 45,
- 46, 47, 50, 51, 56, 57, 58, 59,
+ 46, 47, 50, 51, 56, 57, 58, 59,
52, 53, 54, 55, 60, 61, 62, 63,
};
UINT8 ff_alternate_vertical_scan[64] = {
- 0, 8, 16, 24, 1, 9, 2, 10,
+ 0, 8, 16, 24, 1, 9, 2, 10,
17, 25, 32, 40, 48, 56, 57, 49,
- 41, 33, 26, 18, 3, 11, 4, 12,
+ 41, 33, 26, 18, 3, 11, 4, 12,
19, 27, 34, 42, 50, 58, 35, 43,
- 51, 59, 20, 28, 5, 13, 6, 14,
+ 51, 59, 20, 28, 5, 13, 6, 14,
21, 29, 36, 44, 52, 60, 37, 45,
- 53, 61, 22, 30, 7, 15, 23, 31,
+ 53, 61, 22, 30, 7, 15, 23, 31,
38, 46, 54, 62, 39, 47, 55, 63,
};
@@ -97,50 +97,50 @@ UINT8 ff_alternate_vertical_scan[64] = {
/* Input permutation for the simple_idct_mmx */
static UINT8 simple_mmx_permutation[64]={
- 0x00, 0x08, 0x04, 0x09, 0x01, 0x0C, 0x05, 0x0D,
- 0x10, 0x18, 0x14, 0x19, 0x11, 0x1C, 0x15, 0x1D,
- 0x20, 0x28, 0x24, 0x29, 0x21, 0x2C, 0x25, 0x2D,
- 0x12, 0x1A, 0x16, 0x1B, 0x13, 0x1E, 0x17, 0x1F,
- 0x02, 0x0A, 0x06, 0x0B, 0x03, 0x0E, 0x07, 0x0F,
- 0x30, 0x38, 0x34, 0x39, 0x31, 0x3C, 0x35, 0x3D,
- 0x22, 0x2A, 0x26, 0x2B, 0x23, 0x2E, 0x27, 0x2F,
+ 0x00, 0x08, 0x04, 0x09, 0x01, 0x0C, 0x05, 0x0D,
+ 0x10, 0x18, 0x14, 0x19, 0x11, 0x1C, 0x15, 0x1D,
+ 0x20, 0x28, 0x24, 0x29, 0x21, 0x2C, 0x25, 0x2D,
+ 0x12, 0x1A, 0x16, 0x1B, 0x13, 0x1E, 0x17, 0x1F,
+ 0x02, 0x0A, 0x06, 0x0B, 0x03, 0x0E, 0x07, 0x0F,
+ 0x30, 0x38, 0x34, 0x39, 0x31, 0x3C, 0x35, 0x3D,
+ 0x22, 0x2A, 0x26, 0x2B, 0x23, 0x2E, 0x27, 0x2F,
0x32, 0x3A, 0x36, 0x3B, 0x33, 0x3E, 0x37, 0x3F,
};
#endif
/* a*inverse[b]>>32 == a/b for all 0<=a<=65536 && 2<=b<=255 */
UINT32 inverse[256]={
- 0, 4294967295U,2147483648U,1431655766, 1073741824, 858993460, 715827883, 613566757,
- 536870912, 477218589, 429496730, 390451573, 357913942, 330382100, 306783379, 286331154,
- 268435456, 252645136, 238609295, 226050911, 214748365, 204522253, 195225787, 186737709,
- 178956971, 171798692, 165191050, 159072863, 153391690, 148102321, 143165577, 138547333,
- 134217728, 130150525, 126322568, 122713352, 119304648, 116080198, 113025456, 110127367,
- 107374183, 104755300, 102261127, 99882961, 97612894, 95443718, 93368855, 91382283,
- 89478486, 87652394, 85899346, 84215046, 82595525, 81037119, 79536432, 78090315,
- 76695845, 75350304, 74051161, 72796056, 71582789, 70409300, 69273667, 68174085,
- 67108864, 66076420, 65075263, 64103990, 63161284, 62245903, 61356676, 60492498,
- 59652324, 58835169, 58040099, 57266231, 56512728, 55778797, 55063684, 54366675,
- 53687092, 53024288, 52377650, 51746594, 51130564, 50529028, 49941481, 49367441,
- 48806447, 48258060, 47721859, 47197443, 46684428, 46182445, 45691142, 45210183,
- 44739243, 44278014, 43826197, 43383509, 42949673, 42524429, 42107523, 41698712,
- 41297763, 40904451, 40518560, 40139882, 39768216, 39403370, 39045158, 38693400,
- 38347923, 38008561, 37675152, 37347542, 37025581, 36709123, 36398028, 36092163,
- 35791395, 35495598, 35204650, 34918434, 34636834, 34359739, 34087043, 33818641,
- 33554432, 33294321, 33038210, 32786010, 32537632, 32292988, 32051995, 31814573,
- 31580642, 31350127, 31122952, 30899046, 30678338, 30460761, 30246249, 30034737,
- 29826162, 29620465, 29417585, 29217465, 29020050, 28825284, 28633116, 28443493,
- 28256364, 28071682, 27889399, 27709467, 27531842, 27356480, 27183338, 27012373,
- 26843546, 26676816, 26512144, 26349493, 26188825, 26030105, 25873297, 25718368,
- 25565282, 25414008, 25264514, 25116768, 24970741, 24826401, 24683721, 24542671,
- 24403224, 24265352, 24129030, 23994231, 23860930, 23729102, 23598722, 23469767,
- 23342214, 23216040, 23091223, 22967740, 22845571, 22724695, 22605092, 22486740,
- 22369622, 22253717, 22139007, 22025474, 21913099, 21801865, 21691755, 21582751,
- 21474837, 21367997, 21262215, 21157475, 21053762, 20951060, 20849356, 20748635,
- 20648882, 20550083, 20452226, 20355296, 20259280, 20164166, 20069941, 19976593,
- 19884108, 19792477, 19701685, 19611723, 19522579, 19434242, 19346700, 19259944,
- 19173962, 19088744, 19004281, 18920561, 18837576, 18755316, 18673771, 18592933,
- 18512791, 18433337, 18354562, 18276457, 18199014, 18122225, 18046082, 17970575,
- 17895698, 17821442, 17747799, 17674763, 17602325, 17530479, 17459217, 17388532,
+ 0, 4294967295U,2147483648U,1431655766, 1073741824, 858993460, 715827883, 613566757,
+ 536870912, 477218589, 429496730, 390451573, 357913942, 330382100, 306783379, 286331154,
+ 268435456, 252645136, 238609295, 226050911, 214748365, 204522253, 195225787, 186737709,
+ 178956971, 171798692, 165191050, 159072863, 153391690, 148102321, 143165577, 138547333,
+ 134217728, 130150525, 126322568, 122713352, 119304648, 116080198, 113025456, 110127367,
+ 107374183, 104755300, 102261127, 99882961, 97612894, 95443718, 93368855, 91382283,
+ 89478486, 87652394, 85899346, 84215046, 82595525, 81037119, 79536432, 78090315,
+ 76695845, 75350304, 74051161, 72796056, 71582789, 70409300, 69273667, 68174085,
+ 67108864, 66076420, 65075263, 64103990, 63161284, 62245903, 61356676, 60492498,
+ 59652324, 58835169, 58040099, 57266231, 56512728, 55778797, 55063684, 54366675,
+ 53687092, 53024288, 52377650, 51746594, 51130564, 50529028, 49941481, 49367441,
+ 48806447, 48258060, 47721859, 47197443, 46684428, 46182445, 45691142, 45210183,
+ 44739243, 44278014, 43826197, 43383509, 42949673, 42524429, 42107523, 41698712,
+ 41297763, 40904451, 40518560, 40139882, 39768216, 39403370, 39045158, 38693400,
+ 38347923, 38008561, 37675152, 37347542, 37025581, 36709123, 36398028, 36092163,
+ 35791395, 35495598, 35204650, 34918434, 34636834, 34359739, 34087043, 33818641,
+ 33554432, 33294321, 33038210, 32786010, 32537632, 32292988, 32051995, 31814573,
+ 31580642, 31350127, 31122952, 30899046, 30678338, 30460761, 30246249, 30034737,
+ 29826162, 29620465, 29417585, 29217465, 29020050, 28825284, 28633116, 28443493,
+ 28256364, 28071682, 27889399, 27709467, 27531842, 27356480, 27183338, 27012373,
+ 26843546, 26676816, 26512144, 26349493, 26188825, 26030105, 25873297, 25718368,
+ 25565282, 25414008, 25264514, 25116768, 24970741, 24826401, 24683721, 24542671,
+ 24403224, 24265352, 24129030, 23994231, 23860930, 23729102, 23598722, 23469767,
+ 23342214, 23216040, 23091223, 22967740, 22845571, 22724695, 22605092, 22486740,
+ 22369622, 22253717, 22139007, 22025474, 21913099, 21801865, 21691755, 21582751,
+ 21474837, 21367997, 21262215, 21157475, 21053762, 20951060, 20849356, 20748635,
+ 20648882, 20550083, 20452226, 20355296, 20259280, 20164166, 20069941, 19976593,
+ 19884108, 19792477, 19701685, 19611723, 19522579, 19434242, 19346700, 19259944,
+ 19173962, 19088744, 19004281, 18920561, 18837576, 18755316, 18673771, 18592933,
+ 18512791, 18433337, 18354562, 18276457, 18199014, 18122225, 18046082, 17970575,
+ 17895698, 17821442, 17747799, 17674763, 17602325, 17530479, 17459217, 17388532,
17318417, 17248865, 17179870, 17111424, 17043522, 16976156, 16909321, 16843010,
};
@@ -148,7 +148,7 @@ UINT32 inverse[256]={
UINT8 zigzag_end[64];
UINT8 permutation[64];
-//UINT8 invPermutation[64];
+/* UINT8 invPermutation[64]; */
static void build_zigzag_end(void)
{
@@ -156,7 +156,7 @@ static void build_zigzag_end(void)
int lastIndexAfterPerm=0;
for(lastIndex=0; lastIndex<64; lastIndex++)
{
- if(zigzag_direct[lastIndex] > lastIndexAfterPerm)
+ if(zigzag_direct[lastIndex] > lastIndexAfterPerm)
lastIndexAfterPerm= zigzag_direct[lastIndex];
zigzag_end[lastIndex]= lastIndexAfterPerm + 1;
}
@@ -253,7 +253,7 @@ void put_pixels_clamped_c(const DCTELEM *block, UINT8 *restrict pixels,
{
int i;
UINT8 *cm = cropTbl + MAX_NEG_CROP;
-
+
/* read the pixels */
for(i=0;i<8;i++) {
pixels[0] = cm[block[0]];
@@ -275,7 +275,7 @@ void add_pixels_clamped_c(const DCTELEM *block, UINT8 *restrict pixels,
{
int i;
UINT8 *cm = cropTbl + MAX_NEG_CROP;
-
+
/* read the pixels */
for(i=0;i<8;i++) {
pixels[0] = cm[pixels[0] + block[0]];
@@ -458,7 +458,7 @@ void (*OPNAME ## _no_rnd_pixels_tab[2][4])(uint8_t *block, const uint8_t *pixels
};
#define op_avg(a, b) a = ( ((a)|(b)) - ((((a)^(b))&0xFEFEFEFEFEFEFEFEULL)>>1) )
-#else // 64 bit variant
+#else /* 64 bit variant */
#define PIXOP2(OPNAME, OP) \
static void OPNAME ## _pixels8(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
@@ -1332,7 +1332,7 @@ qpel_mc_func OPNAME ## qpel_pixels_tab[2][16]={ \
QPEL_MC(0, put_ , _ , op_put)
QPEL_MC(1, put_no_rnd_, _no_rnd_, op_put_no_rnd)
QPEL_MC(0, avg_ , _ , op_avg)
-//QPEL_MC(1, avg_no_rnd , _ , op_avg)
+/* QPEL_MC(1, avg_no_rnd , _ , op_avg) */
#undef op_avg
#undef op_avg_no_rnd
#undef op_put
@@ -1676,7 +1676,7 @@ void dsputil_init(void)
for(i=0; i<64; i++) inv_zigzag_direct16[zigzag_direct[i]]= i+1;
for(i=0; i<64; i++) zigzag_direct_noperm[i]= zigzag_direct[i];
-
+
if (use_permuted_idct) {
/* permute for IDCT */
for(i=0;i<64;i++) {
@@ -1692,7 +1692,7 @@ void dsputil_init(void)
block_permute(ff_mpeg4_default_intra_matrix);
block_permute(ff_mpeg4_default_non_intra_matrix);
}
-
+
build_zigzag_end();
}
@@ -1712,14 +1712,14 @@ void get_psnr(UINT8 *orig_image[3], UINT8 *coded_image[3],
int quad, diff, x, y;
UINT8 *orig, *coded;
UINT32 *sq = squareTbl + 256;
-
+
quad = 0;
diff = 0;
-
+
/* Luminance */
orig = orig_image[0];
coded = coded_image[0];
-
+
for (y=0;y<avctx->height;y++) {
for (x=0;x<avctx->width;x++) {
diff = *(orig + x) - *(coded + x);
@@ -1728,12 +1728,12 @@ void get_psnr(UINT8 *orig_image[3], UINT8 *coded_image[3],
orig += orig_linesize[0];
coded += coded_linesize;
}
-
+
avctx->psnr_y = (float) quad / (float) (avctx->width * avctx->height);
-
+
if (avctx->psnr_y) {
avctx->psnr_y = (float) (255 * 255) / avctx->psnr_y;
- avctx->psnr_y = 10 * (float) log10 (avctx->psnr_y);
+ avctx->psnr_y = 10 * (float) log10 (avctx->psnr_y);
} else
avctx->psnr_y = 99.99;
}
diff --git a/src/libffmpeg/libavcodec/eval.c b/src/libffmpeg/libavcodec/eval.c
index bcaf4f59b..df2f4e29f 100644
--- a/src/libffmpeg/libavcodec/eval.c
+++ b/src/libffmpeg/libavcodec/eval.c
@@ -43,11 +43,11 @@ typedef struct Parser{
int stack_index;
char *s;
double *const_value;
- char **const_name; // NULL terminated
- double (**func1)(void *, double a); // NULL terminated
- char **func1_name; // NULL terminated
- double (**func2)(void *, double a, double b); // NULL terminated
- char **func2_name; // NULL terminated
+ char **const_name; /* NULL terminated */
+ double (**func1)(void *, double a); /* NULL terminated */
+ char **func1_name; /* NULL terminated */
+ double (**func2)(void *, double a, double b); /* NULL terminated */
+ char **func2_name; /* NULL terminated */
void *opaque;
} Parser;
@@ -59,7 +59,7 @@ static void push(Parser *p, double d){
return;
}
p->stack[ p->stack_index++ ]= d;
-//printf("push %f\n", d); fflush(stdout);
+/* printf("push %f\n", d); fflush(stdout); */
}
static double pop(Parser *p){
@@ -67,7 +67,7 @@ static double pop(Parser *p){
fprintf(stderr, "stack underflow in the parser\n");
return NAN;
}
-//printf("pop\n"); fflush(stdout);
+/* printf("pop\n"); fflush(stdout); */
return p->stack[ --p->stack_index ];
}
@@ -91,7 +91,7 @@ static void evalPrimary(Parser *p){
p->s= next;
return;
}
-
+
/* named constants */
for(i=0; p->const_name[i]; i++){
if(strmatch(p->s, p->const_name[i])){
@@ -100,22 +100,22 @@ static void evalPrimary(Parser *p){
return;
}
}
-
+
p->s= strchr(p->s, '(');
if(p->s==NULL){
fprintf(stderr, "Parser: missing ( in \"%s\"\n", next);
return;
}
- p->s++; // "("
+ p->s++; /* "(" */
evalExpression(p);
d= pop(p);
- p->s++; // ")" or ","
+ p->s++; /* ")" or "," */
if(p->s[-1]== ','){
evalExpression(p);
d2= pop(p);
- p->s++; // ")"
+ p->s++; /* ")" */
}
-
+
if( strmatch(next, "sinh" ) ) d= sinh(d);
else if( strmatch(next, "cosh" ) ) d= cosh(d);
else if( strmatch(next, "tanh" ) ) d= tanh(d);
@@ -132,8 +132,8 @@ static void evalPrimary(Parser *p){
else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0;
else if( strmatch(next, "lt" ) ) d= d > d2 ? 0.0 : 1.0;
else if( strmatch(next, "eq" ) ) d= d == d2 ? 1.0 : 0.0;
-// else if( strmatch(next, "l1" ) ) d= 1 + d2*(d - 1);
-// else if( strmatch(next, "sq01" ) ) d= (d >= 0.0 && d <=1.0) ? 1.0 : 0.0;
+/* else if( strmatch(next, "l1" ) ) d= 1 + d2*(d - 1); */
+/* else if( strmatch(next, "sq01" ) ) d= (d >= 0.0 && d <=1.0) ? 1.0 : 0.0; */
else{
int error=1;
for(i=0; p->func1_name && p->func1_name[i]; i++){
@@ -157,23 +157,23 @@ static void evalPrimary(Parser *p){
return;
}
}
-
+
if(p->s[-1]!= ')'){
fprintf(stderr, "Parser: missing ) in \"%s\"\n", next);
return;
}
push(p, d);
-}
-
+}
+
static void evalPow(Parser *p){
int neg= 0;
if(p->s[0]=='+') p->s++;
-
- if(p->s[0]=='-'){
+
+ if(p->s[0]=='-'){
neg= 1;
p->s++;
}
-
+
if(p->s[0]=='('){
p->s++;;
evalExpression(p);
@@ -184,7 +184,7 @@ static void evalPow(Parser *p){
}else{
evalPrimary(p);
}
-
+
if(neg) push(p, -pop(p));
}
@@ -229,11 +229,11 @@ static void evalExpression(Parser *p){
}
double ff_eval(char *s, double *const_value, char **const_name,
- double (**func1)(void *, double), char **func1_name,
+ double (**func1)(void *, double), char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
void *opaque){
Parser p;
-
+
p.stack_index=0;
p.s= s;
p.const_value= const_value;
@@ -243,7 +243,7 @@ double ff_eval(char *s, double *const_value, char **const_name,
p.func2 = func2;
p.func2_name = func2_name;
p.opaque = opaque;
-
+
evalExpression(&p);
return pop(&p);
}
diff --git a/src/libffmpeg/libavcodec/h263.c b/src/libffmpeg/libavcodec/h263.c
index c9a0a9d30..56fa2dc87 100644
--- a/src/libffmpeg/libavcodec/h263.c
+++ b/src/libffmpeg/libavcodec/h263.c
@@ -19,11 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* ac prediction encoding, b-frame support, error resilience, optimizations,
- * qpel decoding, gmc decoding, interlaced decoding,
+ * qpel decoding, gmc decoding, interlaced decoding,
* by Michael Niedermayer <michaelni@gmx.at>
*/
-
-//#define DEBUG
+
+/* #define DEBUG */
#include "common.h"
#include "dsputil.h"
#include "avcodec.h"
@@ -31,11 +31,11 @@
#include "h263data.h"
#include "mpeg4data.h"
-//rounded divison & shift
+/* rounded divison & shift */
#define RSHIFT(a,b) ((a) > 0 ? ((a) + (1<<((b)-1)))>>(b) : ((a) + (1<<((b)-1))-1)>>(b))
#define PRINT_MB_TYPE(a) {}
-//#define PRINT_MB_TYPE(a) printf(a)
+/* #define PRINT_MB_TYPE(a) printf(a) */
#define INTRA_MCBPC_VLC_BITS 6
#define INTER_MCBPC_VLC_BITS 6
@@ -51,7 +51,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block,
static void h263_encode_motion(MpegEncContext * s, int val, int fcode);
static void h263p_encode_umotion(MpegEncContext * s, int val);
static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block,
- int n, int dc, UINT8 *scan_table,
+ int n, int dc, UINT8 *scan_table,
PutBitContext *dc_pb, PutBitContext *ac_pb);
static int h263_decode_motion(MpegEncContext * s, int pred, int fcode);
static int h263p_decode_umotion(MpegEncContext * s, int pred);
@@ -78,7 +78,7 @@ static UINT8 uni_mpeg4_intra_rl_len [64*64*2*2];
static UINT32 uni_mpeg4_inter_rl_bits[64*64*2*2];
static UINT8 uni_mpeg4_inter_rl_len [64*64*2*2];
#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128 + (run)*256 + (level))
-//#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64)
+/* #define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64) */
/* mpeg4
inter
@@ -120,7 +120,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
s->gob_number = 0;
put_bits(&s->pb, 22, 0x20); /* PSC */
- put_bits(&s->pb, 8, (((INT64)s->picture_number * 30 * FRAME_RATE_BASE) /
+ put_bits(&s->pb, 8, (((INT64)s->picture_number * 30 * FRAME_RATE_BASE) /
s->frame_rate) & 0xff);
put_bits(&s->pb, 1, 1); /* marker */
@@ -128,7 +128,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 1, 0); /* split screen off */
put_bits(&s->pb, 1, 0); /* camera off */
put_bits(&s->pb, 1, 0); /* freeze picture release off */
-
+
format = h263_get_picture_format(s->width, s->height);
if (!s->h263_plus) {
/* H.263v1 */
@@ -152,7 +152,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb,3,6); /* Custom Source Format */
else
put_bits(&s->pb, 3, format);
-
+
put_bits(&s->pb,1,0); /* Custom PCF: off */
s->umvplus = (s->pict_type == P_TYPE) && s->unrestricted_mv;
put_bits(&s->pb, 1, s->umvplus); /* Unrestricted Motion Vector */
@@ -167,9 +167,9 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb,1,0); /* Modified Quantization: off */
put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
put_bits(&s->pb,3,0); /* Reserved */
-
+
put_bits(&s->pb, 3, s->pict_type == P_TYPE);
-
+
put_bits(&s->pb,1,0); /* Reference Picture Resampling: off */
put_bits(&s->pb,1,0); /* Reduced-Resolution Update: off */
if (s->pict_type == I_TYPE)
@@ -179,13 +179,13 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb,1,s->no_rounding); /* Rounding Type */
put_bits(&s->pb,2,0); /* Reserved */
put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
-
+
/* This should be here if PLUSPTYPE */
put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */
-
+
if (format == 7) {
/* Custom Picture Format (CPFMT) */
-
+
if (s->aspect_ratio_info)
put_bits(&s->pb,4,s->aspect_ratio_info);
else
@@ -199,7 +199,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 8, s->aspected_height);
}
}
-
+
/* Unlimited Unrestricted Motion Vectors Indicator (UUI) */
if (s->umvplus)
put_bits(&s->pb,1,1); /* Limited according tables of Annex D */
@@ -209,7 +209,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 1, 0); /* no PEI */
if(s->h263_aic){
- s->y_dc_scale_table=
+ s->y_dc_scale_table=
s->c_dc_scale_table= h263_aic_dc_scale_table;
}else{
s->y_dc_scale_table=
@@ -220,7 +220,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
int h263_encode_gob_header(MpegEncContext * s, int mb_line)
{
int pdif=0;
-
+
/* Check to see if we need to put a new GBSC */
/* for RTP packetization */
if (s->rtp_mode) {
@@ -240,7 +240,7 @@ int h263_encode_gob_header(MpegEncContext * s, int mb_line)
put_bits(&s->pb, 5, s->gob_number); /* GN */
put_bits(&s->pb, 2, s->pict_type == I_TYPE); /* GFID */
put_bits(&s->pb, 5, s->qscale); /* GQUANT */
- //fprintf(stderr,"\nGOB: %2d size: %d", s->gob_number - 1, pdif);
+ /* fprintf(stderr,"\nGOB: %2d size: %d", s->gob_number - 1, pdif); */
return pdif;
} else if (pdif + s->mb_line_avgsize >= s->rtp_payload_size) {
/* Cut the packet before we can't */
@@ -257,7 +257,7 @@ int h263_encode_gob_header(MpegEncContext * s, int mb_line)
put_bits(&s->pb, 5, s->gob_number); /* GN */
put_bits(&s->pb, 2, s->pict_type == I_TYPE); /* GFID */
put_bits(&s->pb, 5, s->qscale); /* GQUANT */
- //fprintf(stderr,"\nGOB: %2d size: %d", s->gob_number - 1, pdif);
+ /* fprintf(stderr,"\nGOB: %2d size: %d", s->gob_number - 1, pdif); */
return pdif;
}
}
@@ -295,7 +295,7 @@ static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], int d
}
}
- return score0 > score1 ? 1 : 0;
+ return score0 > score1 ? 1 : 0;
}
void mpeg4_encode_mb(MpegEncContext * s,
@@ -308,8 +308,8 @@ void mpeg4_encode_mb(MpegEncContext * s,
PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=B_TYPE ? &s->tex_pb : &s->pb;
PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=I_TYPE ? &s->pb2 : &s->pb;
const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0;
-
- // printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
+
+ /* printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); */
if (!s->mb_intra) {
/* compute cbp */
int cbp = 0;
@@ -321,22 +321,22 @@ void mpeg4_encode_mb(MpegEncContext * s,
if(s->pict_type==B_TYPE){
static const int mb_type_table[8]= {-1, 2, 3, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */
int mb_type= mb_type_table[s->mv_dir];
-
+
if(s->mb_x==0){
- s->last_mv[0][0][0]=
- s->last_mv[0][0][1]=
- s->last_mv[1][0][0]=
+ s->last_mv[0][0][0]=
+ s->last_mv[0][0][1]=
+ s->last_mv[1][0][0]=
s->last_mv[1][0][1]= 0;
}
/* nothing to do if this MB was skiped in the next P Frame */
if(s->mbskip_table[s->mb_y * s->mb_width + s->mb_x]){
s->skip_count++;
- s->mv[0][0][0]=
- s->mv[0][0][1]=
- s->mv[1][0][0]=
+ s->mv[0][0][0]=
+ s->mv[0][0][1]=
+ s->mv[1][0][0]=
s->mv[1][0][1]= 0;
- s->mv_dir= MV_DIR_FORWARD; //doesnt matter
+ s->mv_dir= MV_DIR_FORWARD; /* doesnt matter */
return;
}
@@ -352,10 +352,10 @@ void mpeg4_encode_mb(MpegEncContext * s,
return;
}
put_bits(&s->pb, 1, 0); /* mb coded modb1=0 */
- put_bits(&s->pb, 1, cbp ? 0 : 1); /* modb2 */ //FIXME merge
- put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we dont need it :)
+ put_bits(&s->pb, 1, cbp ? 0 : 1); /* modb2 */ /* FIXME merge */
+ put_bits(&s->pb, mb_type+1, 1); /* this table is so simple that we dont need it :) */
if(cbp) put_bits(&s->pb, 6, cbp);
-
+
if(cbp && mb_type)
put_bits(&s->pb, 1, 0); /* no q-scale change */
@@ -369,7 +369,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
{
case 0: /* direct */
h263_encode_motion(s, motion_x, 1);
- h263_encode_motion(s, motion_y, 1);
+ h263_encode_motion(s, motion_y, 1);
s->b_count++;
s->f_count++;
break;
@@ -422,7 +422,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
}
}else{ /* s->pict_type==B_TYPE */
if ((cbp | motion_x | motion_y) == 0 && s->mv_type==MV_TYPE_16X16) {
- /* check if the B frames can skip it too, as we must skip it if we skip here
+ /* check if the B frames can skip it too, as we must skip it if we skip here
why didnt they just compress the skip-mb bits instead of reusing them ?! */
if(s->max_b_frames>0){
int i;
@@ -436,7 +436,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
offset= x + y*s->linesize;
p_pic= s->new_picture[0] + offset;
-
+
s->mb_skiped=1;
for(i=0; i<s->max_b_frames; i++){
uint8_t *b_pic;
@@ -446,13 +446,13 @@ void mpeg4_encode_mb(MpegEncContext * s,
b_pic= s->coded_order[i+1].picture[0] + offset;
diff= pix_abs16x16(p_pic, b_pic, s->linesize);
- if(diff>s->qscale*70){ //FIXME check that 70 is optimal
+ if(diff>s->qscale*70){ /* FIXME check that 70 is optimal */
s->mb_skiped=0;
break;
}
}
}else
- s->mb_skiped=1;
+ s->mb_skiped=1;
if(s->mb_skiped==1){
/* skip macroblock */
@@ -476,7 +476,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
cbpy = cbp >> 2;
cbpy ^= 0xf;
put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]);
-
+
if(interleaved_stats){
bits= get_bit_count(&s->pb);
s->misc_bits+= bits - s->last_bits;
@@ -485,7 +485,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
/* motion vectors: 16x16 mode */
h263_pred_motion(s, 0, &pred_x, &pred_y);
-
+
h263_encode_motion(s, motion_x - pred_x, s->f_code);
h263_encode_motion(s, motion_y - pred_y, s->f_code);
}else{
@@ -512,7 +512,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
}
}
- if(interleaved_stats){
+ if(interleaved_stats){
bits= get_bit_count(&s->pb);
s->mv_bits+= bits - s->last_bits;
s->last_bits=bits;
@@ -532,8 +532,8 @@ void mpeg4_encode_mb(MpegEncContext * s,
}
} else {
int cbp;
- int dc_diff[6]; //dc values with the dc prediction subtracted
- int dir[6]; //prediction direction
+ int dc_diff[6]; /* dc values with the dc prediction subtracted */
+ int dir[6]; /* prediction direction */
int zigzag_last_index[6];
UINT8 *scan_table[6];
@@ -560,7 +560,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
if (dir[i]==0) st = ff_alternate_vertical_scan; /* left */
else st = ff_alternate_horizontal_scan; /* top */
- for(last_index=63; last_index>=0; last_index--) //FIXME optimize
+ for(last_index=63; last_index>=0; last_index--) /* FIXME optimize */
if(block[i][st[last_index]]) break;
zigzag_last_index[i]= s->block_last_index[i];
s->block_last_index[i]= last_index;
@@ -614,16 +614,16 @@ void mpeg4_encode_mb(MpegEncContext * s,
/* restore ac coeffs & last_index stuff if we messed them up with the prediction */
if(s->ac_pred){
for(i=0; i<6; i++){
- int j;
+ int j;
INT16 *ac_val;
ac_val = s->ac_val[0][0] + s->block_index[i] * 16;
if(dir[i]){
- for(j=1; j<8; j++)
+ for(j=1; j<8; j++)
block[i][block_permute_op(j )]= ac_val[j+8];
}else{
- for(j=1; j<8; j++)
+ for(j=1; j<8; j++)
block[i][block_permute_op(j<<3)]= ac_val[j ];
}
s->block_last_index[i]= zigzag_last_index[i];
@@ -640,8 +640,8 @@ void h263_encode_mb(MpegEncContext * s,
INT16 pred_dc;
INT16 rec_intradc[6];
UINT16 *dc_ptr[6];
-
- //printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
+
+ /* printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); */
if (!s->mb_intra) {
/* compute cbp */
cbp = 0;
@@ -665,8 +665,8 @@ void h263_encode_mb(MpegEncContext * s,
/* motion vectors: 16x16 mode only now */
h263_pred_motion(s, 0, &pred_x, &pred_y);
-
- if (!s->umvplus) {
+
+ if (!s->umvplus) {
h263_encode_motion(s, motion_x - pred_x, s->f_code);
h263_encode_motion(s, motion_y - pred_y, s->f_code);
}
@@ -679,13 +679,13 @@ void h263_encode_mb(MpegEncContext * s,
}
} else {
int li = s->h263_aic ? 0 : 1;
-
+
cbp = 0;
for(i=0; i<6; i++) {
/* Predict DC */
if (s->h263_aic && s->mb_intra) {
INT16 level = block[i][0];
-
+
pred_dc = h263_pred_dc(s, i, &dc_ptr[i]);
level -= pred_dc;
/* Quant */
@@ -693,7 +693,7 @@ void h263_encode_mb(MpegEncContext * s,
level = (level + (s->qscale >> 1))/(s->y_dc_scale);
else
level = (level - (s->qscale >> 1))/(s->y_dc_scale);
-
+
/* AIC can change CBP */
if (level == 0 && s->block_last_index[i] == 0)
s->block_last_index[i] = -1;
@@ -701,20 +701,20 @@ void h263_encode_mb(MpegEncContext * s,
level = -127;
else if (level > 127)
level = 127;
-
+
block[i][0] = level;
- /* Reconstruction */
+ /* Reconstruction */
rec_intradc[i] = (s->y_dc_scale*level) + pred_dc;
/* Oddify */
rec_intradc[i] |= 1;
- //if ((rec_intradc[i] % 2) == 0)
- // rec_intradc[i]++;
+ /* if ((rec_intradc[i] % 2) == 0) */
+ /* rec_intradc[i]++; */
/* Clipping */
if (rec_intradc[i] < 0)
rec_intradc[i] = 0;
else if (rec_intradc[i] > 2047)
rec_intradc[i] = 2047;
-
+
/* Update AC/DC tables */
*dc_ptr[i] = rec_intradc[i];
}
@@ -745,11 +745,11 @@ void h263_encode_mb(MpegEncContext * s,
for(i=0; i<6; i++) {
/* encode each block */
h263_encode_block(s, block[i], i);
-
+
/* Update INTRADC for decoding */
if (s->h263_aic && s->mb_intra) {
block[i][0] = rec_intradc[i];
-
+
}
}
}
@@ -776,11 +776,11 @@ static int h263_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr)
scale = s->c_dc_scale;
}
/* B C
- * A X
+ * A X
*/
a = dc_val[(x - 1) + (y) * wrap];
c = dc_val[(x) + (y - 1) * wrap];
-
+
/* No prediction outside GOB boundary */
if (s->first_slice_line && ((n < 2) || (n > 3)))
c = 1024;
@@ -792,9 +792,9 @@ static int h263_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr)
pred_dc = a;
else
pred_dc = c;
-
+
/* we assume pred is positive */
- //pred_dc = (pred_dc + (scale >> 1)) / scale;
+ /* pred_dc = (pred_dc + (scale >> 1)) / scale; */
*dc_val_ptr = &dc_val[x + y * wrap];
return pred_dc;
}
@@ -821,16 +821,16 @@ void h263_pred_acdc(MpegEncContext * s, INT16 *block, int n)
ac_val = s->ac_val[n - 4 + 1][0];
scale = s->c_dc_scale;
}
-
+
ac_val += ((y) * wrap + (x)) * 16;
ac_val1 = ac_val;
-
+
/* B C
- * A X
+ * A X
*/
a = dc_val[(x - 1) + (y) * wrap];
c = dc_val[(x) + (y - 1) * wrap];
-
+
/* No prediction outside GOB boundary */
if (s->first_slice_line && ((n < 2) || (n > 3)))
c = 1024;
@@ -864,18 +864,18 @@ void h263_pred_acdc(MpegEncContext * s, INT16 *block, int n)
else
pred_dc = c;
}
-
+
/* we assume pred is positive */
block[0]=block[0]*scale + pred_dc;
-
+
if (block[0] < 0)
block[0] = 0;
else if (!(block[0] & 1))
block[0]++;
-
+
/* Update AC/DC tables */
dc_val[(x) + (y) * wrap] = block[0];
-
+
/* left copy */
for(i=1;i<8;i++)
ac_val1[i] = block[block_permute_op(i * 8)];
@@ -884,7 +884,7 @@ void h263_pred_acdc(MpegEncContext * s, INT16 *block, int n)
ac_val1[8 + i] = block[block_permute_op(i)];
}
-INT16 *h263_pred_motion(MpegEncContext * s, int block,
+INT16 *h263_pred_motion(MpegEncContext * s, int block,
int *px, int *py)
{
int xy, wrap;
@@ -899,12 +899,12 @@ INT16 *h263_pred_motion(MpegEncContext * s, int block,
A = s->motion_val[xy - 1];
/* special case for first (slice) line */
if ((s->mb_y == 0 || s->first_slice_line) && block<3) {
- // we cant just change some MVs to simulate that as we need them for the B frames (and ME)
- // and if we ever support non rectangular objects than we need to do a few ifs here anyway :(
- if(block==0){ //most common case
- if(s->mb_x == s->resync_mb_x){ //rare
+ /* we cant just change some MVs to simulate that as we need them for the B frames (and ME) */
+ /* and if we ever support non rectangular objects than we need to do a few ifs here anyway :( */
+ if(block==0){ /* most common case */
+ if(s->mb_x == s->resync_mb_x){ /* rare */
*px= *py = 0;
- }else if(s->mb_x + 1 == s->resync_mb_x){ //rare
+ }else if(s->mb_x + 1 == s->resync_mb_x){ /* rare */
C = s->motion_val[xy + off[block] - wrap];
if(s->mb_x==0){
*px = C[0];
@@ -918,7 +918,7 @@ INT16 *h263_pred_motion(MpegEncContext * s, int block,
*py = A[1];
}
}else if(block==1){
- if(s->mb_x + 1 == s->resync_mb_x){ //rare
+ if(s->mb_x + 1 == s->resync_mb_x){ /* rare */
C = s->motion_val[xy + off[block] - wrap];
*px = mid_pred(A[0], 0, C[0]);
*py = mid_pred(A[1], 0, C[1]);
@@ -929,9 +929,9 @@ INT16 *h263_pred_motion(MpegEncContext * s, int block,
}else{ /* block==2*/
B = s->motion_val[xy - wrap];
C = s->motion_val[xy + off[block] - wrap];
- if(s->mb_x == s->resync_mb_x) //rare
+ if(s->mb_x == s->resync_mb_x) /* rare */
A[0]=A[1]=0;
-
+
*px = mid_pred(A[0], B[0], C[0]);
*py = mid_pred(A[1], B[1], C[1]);
}
@@ -974,7 +974,7 @@ static void h263_encode_motion(MpegEncContext * s, int val, int f_code)
code = (val >> bit_size) + 1;
bits = val & (range - 1);
- put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign);
+ put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign);
if (bit_size > 0) {
put_bits(&s->pb, bit_size, bits);
}
@@ -984,13 +984,13 @@ static void h263_encode_motion(MpegEncContext * s, int val, int f_code)
/* Encode MV differences on H.263+ with Unrestricted MV mode */
static void h263p_encode_umotion(MpegEncContext * s, int val)
{
- short sval = 0;
+ short sval = 0;
short i = 0;
short n_bits = 0;
short temp_val;
int code = 0;
int tcode;
-
+
if ( val == 0)
put_bits(&s->pb, 1, 1);
else if (val == 1)
@@ -998,15 +998,15 @@ static void h263p_encode_umotion(MpegEncContext * s, int val)
else if (val == -1)
put_bits(&s->pb, 3, 2);
else {
-
+
sval = ((val < 0) ? (short)(-val):(short)val);
temp_val = sval;
-
+
while (temp_val != 0) {
temp_val = temp_val >> 1;
n_bits++;
}
-
+
i = n_bits - 1;
while (i > 0) {
tcode = (sval & (1 << (i-1))) >> (i-1);
@@ -1016,7 +1016,7 @@ static void h263p_encode_umotion(MpegEncContext * s, int val)
}
code = ((code << 1) | (val < 0)) << 1;
put_bits(&s->pb, (2*n_bits)+1, code);
- //printf("\nVal = %d\tCode = %d", sval, code);
+ /* printf("\nVal = %d\tCode = %d", sval, code); */
}
}
@@ -1036,7 +1036,7 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s)
range = 1 << bit_size;
val=mv;
- if (val < 0)
+ if (val < 0)
val = -val;
val--;
code = (val >> bit_size) + 1;
@@ -1099,7 +1099,7 @@ static void init_uni_dc_tab(void)
/* chrominance */
uni_code= DCtab_chrom[size][0];
uni_len = DCtab_chrom[size][1];
-
+
if (size > 0) {
uni_code<<=size; uni_code|=l;
uni_len+=size;
@@ -1116,7 +1116,7 @@ static void init_uni_dc_tab(void)
static void init_uni_mpeg4_rl_tab(RLTable *rl, UINT32 *bits_tab, UINT8 *len_tab){
int slevel, run, last;
-
+
assert(MAX_LEVEL >= 64);
assert(MAX_RUN >= 63);
@@ -1129,15 +1129,15 @@ static void init_uni_mpeg4_rl_tab(RLTable *rl, UINT32 *bits_tab, UINT8 *len_tab)
int sign= slevel < 0 ? 1 : 0;
int bits, len, code;
int level1, run1;
-
+
len_tab[index]= 100;
-
+
/* ESC0 */
code= get_rl_index(rl, last, run, level);
bits= rl->table_vlc[code][0];
len= rl->table_vlc[code][1];
bits=bits*2+sign; len++;
-
+
if(code!=rl->n && len < len_tab[index]){
bits_tab[index]= bits;
len_tab [index]= len;
@@ -1146,7 +1146,7 @@ static void init_uni_mpeg4_rl_tab(RLTable *rl, UINT32 *bits_tab, UINT8 *len_tab)
/* ESC1 */
bits= rl->table_vlc[rl->n][0];
len= rl->table_vlc[rl->n][1];
- bits=bits*2; len++; //esc1
+ bits=bits*2; len++; /* esc1 */
level1= level - rl->max_level[last][run];
if(level1>0){
code= get_rl_index(rl, last, run, level1);
@@ -1154,18 +1154,18 @@ static void init_uni_mpeg4_rl_tab(RLTable *rl, UINT32 *bits_tab, UINT8 *len_tab)
len += rl->table_vlc[code][1];
bits += rl->table_vlc[code][0];
bits=bits*2+sign; len++;
-
+
if(code!=rl->n && len < len_tab[index]){
bits_tab[index]= bits;
len_tab [index]= len;
}
}
-#endif
+#endif
#if 1
/* ESC2 */
bits= rl->table_vlc[rl->n][0];
len= rl->table_vlc[rl->n][1];
- bits=bits*4+2; len+=2; //esc2
+ bits=bits*4+2; len+=2; /* esc2 */
run1 = run - rl->max_run[last][level] - 1;
if(run1>=0){
code= get_rl_index(rl, last, run1, level);
@@ -1173,23 +1173,23 @@ static void init_uni_mpeg4_rl_tab(RLTable *rl, UINT32 *bits_tab, UINT8 *len_tab)
len += rl->table_vlc[code][1];
bits += rl->table_vlc[code][0];
bits=bits*2+sign; len++;
-
+
if(code!=rl->n && len < len_tab[index]){
bits_tab[index]= bits;
len_tab [index]= len;
}
}
-#endif
- /* ESC3 */
+#endif
+ /* ESC3 */
bits= rl->table_vlc[rl->n][0];
len = rl->table_vlc[rl->n][1];
- bits=bits*4+3; len+=2; //esc3
+ bits=bits*4+3; len+=2; /* esc3 */
bits=bits*2+last; len++;
bits=bits*64+run; len+=6;
- bits=bits*2+1; len++; //marker
+ bits=bits*2+1; len++; /* marker */
bits=bits*4096+(slevel&0xfff); len+=12;
- bits=bits*2+1; len++; //marker
-
+ bits=bits*2+1; len++; /* marker */
+
if(len < len_tab[index]){
bits_tab[index]= bits;
len_tab [index]= len;
@@ -1211,15 +1211,15 @@ void h263_encode_init(MpegEncContext *s)
init_rl(&rl_inter);
init_rl(&rl_intra);
init_rl(&rl_intra_aic);
-
+
init_uni_mpeg4_rl_tab(&rl_intra, uni_mpeg4_intra_rl_bits, uni_mpeg4_intra_rl_len);
init_uni_mpeg4_rl_tab(&rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len);
init_mv_penalty_and_fcode(s);
}
- s->mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p
-
- // use fcodes >1 only for mpeg4 & h263 & h263p FIXME
+ s->mv_penalty= mv_penalty; /* FIXME exact table for msmpeg4 & h263p */
+
+ /* use fcodes >1 only for mpeg4 & h263 & h263p FIXME */
switch(s->codec_id){
case CODEC_ID_MPEG4:
s->fcode_tab= fcode_tab;
@@ -1231,8 +1231,8 @@ void h263_encode_init(MpegEncContext *s)
s->min_qcoeff= -128;
s->max_qcoeff= 127;
break;
- //Note for mpeg4 & h263 the dc-scale table will be set per frame as needed later
- default: //nothing needed default table allready set in mpegvideo.c
+ /* Note for mpeg4 & h263 the dc-scale table will be set per frame as needed later */
+ default: /* nothing needed default table allready set in mpegvideo.c */
s->min_qcoeff= -128;
s->max_qcoeff= 127;
s->y_dc_scale_table=
@@ -1240,11 +1240,11 @@ void h263_encode_init(MpegEncContext *s)
}
if(s->mpeg_quant){
- s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x
+ s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); /* (a + x*3/8)/x */
s->inter_quant_bias= 0;
}else{
s->intra_quant_bias=0;
- s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x
+ s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); /* (a - x/4)/x */
}
}
@@ -1277,7 +1277,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)
if (s->h263_aic && s->mb_intra)
rl = &rl_intra_aic;
}
-
+
/* AC coefs */
last_index = s->block_last_index[n];
last_non_zero = i - 1;
@@ -1321,13 +1321,13 @@ void ff_mpeg4_stuffing(PutBitContext * pbc)
void ff_set_mpeg4_time(MpegEncContext * s, int picture_number){
int time_div, time_mod;
- if(s->pict_type==I_TYPE){ //we will encode a vol header
+ if(s->pict_type==I_TYPE){ /* we will encode a vol header */
s->time_increment_resolution= s->frame_rate/ff_gcd(s->frame_rate, FRAME_RATE_BASE);
if(s->time_increment_resolution>=256*256) s->time_increment_resolution= 256*128;
s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1;
}
-
+
if(s->avctx->pts)
s->time= (s->avctx->pts*s->time_increment_resolution + 500*1000)/(1000*1000);
else
@@ -1347,7 +1347,7 @@ void ff_set_mpeg4_time(MpegEncContext * s, int picture_number){
static void mpeg4_encode_vol_header(MpegEncContext * s)
{
- int vo_ver_id=1; //must be 2 if we want GMC or q-pel
+ int vo_ver_id=1; /* must be 2 if we want GMC or q-pel */
char buf[255];
s->vo_type= s->has_b_frames ? CORE_VO_TYPE : SIMPLE_VO_TYPE;
@@ -1362,7 +1362,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s)
put_bits(&s->pb, 1, 1); /* is obj layer id= yes */
put_bits(&s->pb, 4, vo_ver_id); /* is obj layer ver id */
put_bits(&s->pb, 3, 1); /* is obj layer priority */
- if(s->aspect_ratio_info)
+ if(s->aspect_ratio_info)
put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
else
put_bits(&s->pb, 4, 1); /* aspect ratio info= sqare pixel */
@@ -1383,7 +1383,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s)
put_bits(&s->pb, 2, RECT_SHAPE); /* vol shape= rectangle */
put_bits(&s->pb, 1, 1); /* marker bit */
-
+
put_bits(&s->pb, 16, s->time_increment_resolution);
if (s->time_increment_bits < 1)
s->time_increment_bits = 1;
@@ -1420,7 +1420,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s)
put_bits(&s->pb, 1, 0); /* reduced res vop */
}
put_bits(&s->pb, 1, 0); /* scalability */
-
+
ff_mpeg4_stuffing(&s->pb);
/* user data */
@@ -1438,15 +1438,15 @@ void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
{
int time_incr;
int time_div, time_mod;
-
+
if(s->pict_type==I_TYPE){
s->no_rounding=0;
if(picture_number==0 || !s->strict_std_compliance)
mpeg4_encode_vol_header(s);
}
-
-//printf("num:%d rate:%d base:%d\n", s->picture_number, s->frame_rate, FRAME_RATE_BASE);
-
+
+/* printf("num:%d rate:%d base:%d\n", s->picture_number, s->frame_rate, FRAME_RATE_BASE); */
+
put_bits(&s->pb, 16, 0); /* vop header */
put_bits(&s->pb, 16, 0x1B6); /* vop header */
put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */
@@ -1456,20 +1456,20 @@ void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
time_incr= time_div - s->last_time_base;
while(time_incr--)
put_bits(&s->pb, 1, 1);
-
+
put_bits(&s->pb, 1, 0);
put_bits(&s->pb, 1, 1); /* marker */
put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */
put_bits(&s->pb, 1, 1); /* marker */
put_bits(&s->pb, 1, 1); /* vop coded */
- if ( s->pict_type == P_TYPE
+ if ( s->pict_type == P_TYPE
|| (s->pict_type == S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) {
s->no_rounding ^= 1;
put_bits(&s->pb, 1, s->no_rounding); /* rounding type */
}
put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */
- //FIXME sprite stuff
+ /* FIXME sprite stuff */
put_bits(&s->pb, 5, s->qscale);
@@ -1477,9 +1477,9 @@ void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 3, s->f_code); /* fcode_for */
if (s->pict_type == B_TYPE)
put_bits(&s->pb, 3, s->b_code); /* fcode_back */
- // printf("****frame %d\n", picture_number);
+ /* printf("****frame %d\n", picture_number); */
- s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support
+ s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; /* FIXME add short header support */
s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
s->h_edge_pos= s->width;
s->v_edge_pos= s->height;
@@ -1507,7 +1507,7 @@ inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int
dc_val = s->dc_val[0] + s->block_index[n];
/* B C
- * A X
+ * A X
*/
a = dc_val[ - 1];
b = dc_val[ - 1 - wrap];
@@ -1552,7 +1552,7 @@ void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n,
const int xy= s->mb_x-1 + s->mb_y*s->mb_width;
/* left prediction */
ac_val -= 16;
-
+
if(s->mb_x==0 || s->qscale == s->qscale_table[xy] || n==1 || n==3){
/* same qscale */
for(i=1;i<8;i++) {
@@ -1600,7 +1600,7 @@ static void mpeg4_inv_pred_ac(MpegEncContext * s, INT16 *block, int n,
/* find prediction */
ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
-
+
if (dir == 0) {
/* left prediction */
ac_val -= 16;
@@ -1619,7 +1619,7 @@ static void mpeg4_inv_pred_ac(MpegEncContext * s, INT16 *block, int n,
static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
{
#if 1
-// if(level<-255 || level>255) printf("dc overflow\n");
+/* if(level<-255 || level>255) printf("dc overflow\n"); */
level+=256;
if (n < 4) {
/* luminance */
@@ -1657,7 +1657,7 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
#endif
}
-static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
+static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
{
int last, i, last_non_zero, sign;
@@ -1667,7 +1667,7 @@ static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n
UINT8 *len_tab;
const int last_index = s->block_last_index[n];
- if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away
+ if (s->mb_intra) { /* Note gcc (3.2.1 at least) will optimize this away */
/* mpeg4 based DC predictor */
mpeg4_encode_dc(dc_pb, intra_dc, n);
if(last_index<1) return;
@@ -1694,7 +1694,7 @@ static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n
if((level&(~127)) == 0){
const int index= UNI_MPEG4_ENC_INDEX(0, run, level);
put_bits(ac_pb, len_tab[index], bits_tab[index]);
- }else{ //ESC3
+ }else{ /* ESC3 */
put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(0<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);
}
last_non_zero = i;
@@ -1707,7 +1707,7 @@ static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n
if((level&(~127)) == 0){
const int index= UNI_MPEG4_ENC_INDEX(1, run, level);
put_bits(ac_pb, len_tab[index], bits_tab[index]);
- }else{ //ESC3
+ }else{ /* ESC3 */
put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(1<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);
}
}
@@ -1729,7 +1729,7 @@ static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n
if (code == rl->n) {
int level1, run1;
level1 = level - rl->max_level[last][run];
- if (level1 < 1)
+ if (level1 < 1)
goto esc2;
code = get_rl_index(rl, last, run, level1);
if (code == rl->n) {
@@ -1825,35 +1825,35 @@ void init_rl(RLTable *rl)
void init_vlc_rl(RLTable *rl)
{
int i, q;
-
- init_vlc(&rl->vlc, 9, rl->n + 1,
+
+ init_vlc(&rl->vlc, 9, rl->n + 1,
&rl->table_vlc[0][1], 4, 2,
&rl->table_vlc[0][0], 4, 2);
-
+
for(q=0; q<32; q++){
int qmul= q*2;
int qadd= (q-1)|1;
-
+
if(q==0){
qmul=1;
qadd=0;
}
-
+
rl->rl_vlc[q]= av_malloc(rl->vlc.table_size*sizeof(RL_VLC_ELEM));
for(i=0; i<rl->vlc.table_size; i++){
int code= rl->vlc.table[i][0];
int len = rl->vlc.table[i][1];
int level, run;
-
- if(len==0){ // illegal code
+
+ if(len==0){ /* illegal code */
run= 66;
level= MAX_LEVEL;
- }else if(len<0){ //more bits needed
+ }else if(len<0){ /* more bits needed */
run= 0;
level= code;
}else{
- if(code==rl->n){ //esc
+ if(code==rl->n){ /* esc */
run= 66;
level= 0;
}else{
@@ -1879,10 +1879,10 @@ void h263_decode_init_vlc(MpegEncContext *s)
if (!done) {
done = 1;
- init_vlc(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 8,
+ init_vlc(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 8,
intra_MCBPC_bits, 1, 1,
intra_MCBPC_code, 1, 1);
- init_vlc(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 25,
+ init_vlc(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 25,
inter_MCBPC_bits, 1, 1,
inter_MCBPC_code, 1, 1);
init_vlc(&cbpy_vlc, CBPY_VLC_BITS, 16,
@@ -1911,13 +1911,13 @@ void h263_decode_init_vlc(MpegEncContext *s)
&mb_type_b_tab[0][0], 2, 1);
}
- s->progressive_sequence=1; // set to most likely for the case of incomplete headers
+ s->progressive_sequence=1; /* set to most likely for the case of incomplete headers */
}
int h263_decode_gob_header(MpegEncContext *s)
{
unsigned int val, gfid;
-
+
/* Check for GOB Start Code */
val = show_bits(&s->gb, 16);
if (val == 0) {
@@ -1936,7 +1936,7 @@ int h263_decode_gob_header(MpegEncContext *s)
return 1;
}
return 0;
-
+
}
static inline void memsetw(short *tab, int val, int n)
@@ -1989,14 +1989,14 @@ void ff_mpeg4_encode_video_packet_header(MpegEncContext *s)
else /* S/P_TYPE */
put_bits(&s->pb, s->f_code+15, 0);
put_bits(&s->pb, 1, 1);
-
+
put_bits(&s->pb, mb_num_bits, s->mb_x + s->mb_y*s->mb_width);
put_bits(&s->pb, 5, s->qscale);
put_bits(&s->pb, 1, 0); /* no HEC */
}
/**
- * decodes the next video packet and sets s->next_qscale
+ * decodes the next video packet and sets s->next_qscale
* returns mb_num of the next packet or <0 if something went wrong
*/
static int decode_video_packet_header(MpegEncContext *s, GetBitContext *gb)
@@ -2004,25 +2004,25 @@ static int decode_video_packet_header(MpegEncContext *s, GetBitContext *gb)
int bits;
int mb_num_bits= av_log2(s->mb_num - 1) + 1;
int header_extension=0, mb_num;
-//printf("%X\n", show_bits(&gb, 24));
-//printf("parse_video_packet_header\n");
-// if(show_aligned_bits(gb, 1, 16) != 0) return -1;
-
+/* printf("%X\n", show_bits(&gb, 24)); */
+/* printf("parse_video_packet_header\n"); */
+/* if(show_aligned_bits(gb, 1, 16) != 0) return -1; */
+
/* is there enough space left for a video packet + header */
if( get_bits_count(gb) > gb->size*8-20) return -1;
-//printf("resync at %d %d\n", s->mb_x, s->mb_y);
-// skip_bits(gb, 1);
-// align_get_bits(gb);
+/* printf("resync at %d %d\n", s->mb_x, s->mb_y); */
+/* skip_bits(gb, 1); */
+/* align_get_bits(gb); */
if(get_bits(gb, 16)!=0){
printf("internal error while decoding video packet header\n");
}
-//printf("%X\n", show_bits(gb, 24));
+/* printf("%X\n", show_bits(gb, 24)); */
bits=0;
while(!get_bits1(gb) && bits<30) bits++;
if((s->pict_type == P_TYPE || s->pict_type == S_TYPE) && bits != s->f_code-1){
- printf("marker does not match f_code (is: %d should be: %d pos: %d end %d x: %d y: %d)\n",
+ printf("marker does not match f_code (is: %d should be: %d pos: %d end %d x: %d y: %d)\n",
bits+1, s->f_code, get_bits_count(gb), gb->size*8, s->mb_x, s->mb_y);
return -1;
}else if(s->pict_type == I_TYPE && bits != 0){
@@ -2032,11 +2032,11 @@ static int decode_video_packet_header(MpegEncContext *s, GetBitContext *gb)
printf("marker does not match f/b_code\n");
return -1;
}
-//printf("%X\n", show_bits(gb, 24));
+/* printf("%X\n", show_bits(gb, 24)); */
if(s->shape != RECT_SHAPE){
header_extension= get_bits1(gb);
- //FIXME more stuff here
+ /* FIXME more stuff here */
}
mb_num= get_bits(gb, mb_num_bits);
@@ -2062,15 +2062,15 @@ static int decode_video_packet_header(MpegEncContext *s, GetBitContext *gb)
int time_increment;
int time_incr=0;
- while (get_bits1(gb) != 0)
+ while (get_bits1(gb) != 0)
time_incr++;
check_marker(gb, "before time_increment in video packed header");
time_increment= get_bits(gb, s->time_increment_bits);
check_marker(gb, "before vop_coding_type in video packed header");
-
+
skip_bits(gb, 2); /* vop coding type */
- //FIXME not rect stuff here
+ /* FIXME not rect stuff here */
if(s->shape != BIN_ONLY_SHAPE){
skip_bits(gb, 3); /* intra dc vlc threshold */
@@ -2080,8 +2080,8 @@ static int decode_video_packet_header(MpegEncContext *s, GetBitContext *gb)
fprintf(stderr, "untested\n");
}
- //FIXME reduced res stuff here
-
+ /* FIXME reduced res stuff here */
+
if (s->pict_type != I_TYPE) {
int f_code = get_bits(gb, 3); /* fcode_for */
if(f_code==0){
@@ -2093,12 +2093,12 @@ static int decode_video_packet_header(MpegEncContext *s, GetBitContext *gb)
if(b_code==0){
printf("Error, video packet header damaged (b_code=0)\n");
}
- }
+ }
}
}
- //FIXME new-pred stuff
-
-//printf("parse ok %d %d %d %d\n", mb_num, s->mb_x + s->mb_y*s->mb_width, get_bits_count(gb), get_bits_count(&s->gb));
+ /* FIXME new-pred stuff */
+
+/* printf("parse ok %d %d %d %d\n", mb_num, s->mb_x + s->mb_y*s->mb_width, get_bits_count(gb), get_bits_count(&s->gb)); */
return mb_num;
}
@@ -2123,9 +2123,9 @@ void ff_mpeg4_clean_buffers(MpegEncContext *s)
memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(INT16));
/* clean MV */
- // we cant clear the MVs as they might be needed by a b frame
-// memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(INT16));
-// memset(s->motion_val, 0, 2*sizeof(INT16)*(2 + s->mb_width*2)*(2 + s->mb_height*2));
+ /* we cant clear the MVs as they might be needed by a b frame */
+/* memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(INT16)); */
+/* memset(s->motion_val, 0, 2*sizeof(INT16)*(2 + s->mb_width*2)*(2 + s->mb_height*2)); */
s->last_mv[0][0][0]=
s->last_mv[0][0][1]=
s->last_mv[1][0][0]=
@@ -2136,23 +2136,23 @@ void ff_mpeg4_clean_buffers(MpegEncContext *s)
int ff_mpeg4_resync(MpegEncContext *s)
{
GetBitContext gb;
-
+
/* search & parse next resync marker */
-
+
gb= s->next_resync_gb;
align_get_bits(&gb);
-//printf("mpeg4_resync %d next:%d \n", get_bits_count(&gb), get_bits_count(&s->next_resync_gb));
+/* printf("mpeg4_resync %d next:%d \n", get_bits_count(&gb), get_bits_count(&s->next_resync_gb)); */
for(;;) {
int v= show_bits(&gb, 24);
if( get_bits_count(&gb) >= gb.size*8-24 || v == 1 /* start-code */){
s->mb_num_left= s->mb_num - s->mb_x - s->mb_y*s->mb_width;
-//printf("mpeg4_resync end\n");
- s->gb= s->next_resync_gb; //continue at the next resync marker
+/* printf("mpeg4_resync end\n"); */
+ s->gb= s->next_resync_gb; /* continue at the next resync marker */
return -1;
}else if(v>>8 == 0){
int next;
s->next_resync_pos= get_bits_count(&gb);
-
+
next= decode_video_packet_header(s, &gb);
if(next >= 0){
s->mb_num_left= next - s->mb_x - s->mb_y*s->mb_width;
@@ -2164,7 +2164,7 @@ int ff_mpeg4_resync(MpegEncContext *s)
skip_bits(&gb, 8);
}
s->next_resync_gb=gb;
-
+
return 0;
}
@@ -2196,7 +2196,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
{
static const INT8 quant_tab[4] = { -1, -2, 1, 2 };
int mb_num;
-
+
/* decode first partition */
mb_num=0;
s->first_slice_line=1;
@@ -2207,12 +2207,12 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
const int xy= s->mb_x + s->mb_y*s->mb_width;
int cbpc;
int dir=0;
-
+
mb_num++;
update_block_index(s);
if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1)
s->first_slice_line=0;
-
+
if(s->mb_x==0) PRINT_MB_TYPE("\n");
if(s->pict_type==I_TYPE){
@@ -2241,7 +2241,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
s->mbintra_table[xy]= 1;
for(i=0; i<6; i++){
int dc_pred_dir;
- int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
+ int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
if(dc < 0){
fprintf(stderr, "DC corrupted at %d %d\n", s->mb_x, s->mb_y);
return DECODING_DESYNC;
@@ -2293,15 +2293,15 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
cbpc+=3;
else if (cbpc == 20)
fprintf(stderr, "Stuffing !");
- s->cbp_table[xy]= cbpc&(8+3); //8 is dquant
-
+ s->cbp_table[xy]= cbpc&(8+3); /* 8 is dquant */
+
s->mb_intra = ((cbpc & 4) != 0);
-
+
if(s->mb_intra){
PRINT_MB_TYPE("I");
s->mbintra_table[xy]= 1;
s->mb_type[xy]= MB_TYPE_INTRA;
- mot_val[0 ]= mot_val[2 ]=
+ mot_val[0 ]= mot_val[2 ]=
mot_val[0+stride]= mot_val[2+stride]= 0;
mot_val[1 ]= mot_val[3 ]=
mot_val[1+stride]= mot_val[3+stride]= 0;
@@ -2312,7 +2312,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
if(s->pict_type==S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0)
s->mcsel= get_bits1(&s->gb);
else s->mcsel= 0;
-
+
if ((cbpc & 16) == 0) {
PRINT_MB_TYPE("P");
/* 16x16 motion prediction */
@@ -2331,7 +2331,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
}
if (mx >= 0xffff)
return DECODING_DESYNC;
-
+
if(!s->mcsel)
my = h263_decode_motion(s, pred_y, s->f_code);
else{
@@ -2357,7 +2357,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
mx = h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff)
return DECODING_DESYNC;
-
+
my = h263_decode_motion(s, pred_y, s->f_code);
if (my >= 0xffff)
return DECODING_DESYNC;
@@ -2388,7 +2388,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
mb_num++;
update_block_index(s);
-
+
if(s->pict_type==I_TYPE){
int ac_pred= get_bits1(&s->gb);
int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
@@ -2396,11 +2396,11 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
fprintf(stderr, "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
return DECODING_AC_LOST;
}
-
+
s->cbp_table[xy]|= cbpy<<2;
s->pred_dir_table[xy]|= ac_pred<<7;
}else{ /* P || S_TYPE */
- if(s->mb_type[xy]&MB_TYPE_INTRA){
+ if(s->mb_type[xy]&MB_TYPE_INTRA){
int dir=0,i;
int ac_pred = get_bits1(&s->gb);
int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
@@ -2409,7 +2409,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
fprintf(stderr, "I cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
return DECODING_ACDC_LOST;
}
-
+
if(s->cbp_table[xy] & 8) {
s->qscale += quant_tab[get_bits(&s->gb, 2)];
if (s->qscale < 1)
@@ -2422,7 +2422,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
for(i=0; i<6; i++){
int dc_pred_dir;
- int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
+ int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
if(dc < 0){
fprintf(stderr, "DC corrupted at %d %d\n", s->mb_x, s->mb_y);
return DECODING_ACDC_LOST;
@@ -2430,7 +2430,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
dir<<=1;
if(dc_pred_dir) dir|=1;
}
- s->cbp_table[xy]&= 3; //remove dquant
+ s->cbp_table[xy]&= 3; /* remove dquant */
s->cbp_table[xy]|= cbpy<<2;
s->pred_dir_table[xy]= dir | (ac_pred<<7);
}else if(s->mb_type[xy]&MB_TYPE_SKIPED){
@@ -2443,9 +2443,9 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
fprintf(stderr, "P cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
return DECODING_ACDC_LOST;
}
-
+
if(s->cbp_table[xy] & 8) {
-//fprintf(stderr, "dquant\n");
+/* fprintf(stderr, "dquant\n"); */
s->qscale += quant_tab[get_bits(&s->gb, 2)];
if (s->qscale < 1)
s->qscale = 1;
@@ -2455,16 +2455,16 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
}
s->qscale_table[xy]= s->qscale;
- s->cbp_table[xy]&= 3; //remove dquant
+ s->cbp_table[xy]&= 3; /* remove dquant */
s->cbp_table[xy]|= (cbpy^0xf)<<2;
}
}
}
s->mb_x= 0;
}
-
- return 0;
+
+ return 0;
}
static int mpeg4_decode_partitioned_mb(MpegEncContext *s,
@@ -2473,15 +2473,15 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s,
int cbp, mb_type;
const int xy= s->mb_x + s->mb_y*s->mb_width;
- if(s->mb_x==s->resync_mb_x && s->mb_y==s->resync_mb_y){ //Note resync_mb_{x,y}==0 at the start
+ if(s->mb_x==s->resync_mb_x && s->mb_y==s->resync_mb_y){ /* Note resync_mb_{x,y}==0 at the start */
int i;
int block_index_backup[6];
int qscale= s->qscale;
-
+
for(i=0; i<6; i++) block_index_backup[i]= s->block_index[i];
-
+
s->decoding_error= ff_mpeg4_decode_partitions(s);
-
+
for(i=0; i<6; i++) s->block_index[i]= block_index_backup[i];
s->first_slice_line=1;
s->mb_x= s->resync_mb_x;
@@ -2491,11 +2491,11 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s,
if(s->decoding_error==DECODING_DESYNC) return -1;
}
-
+
mb_type= s->mb_type[xy];
if(s->decoding_error)
cbp=0;
- else
+ else
cbp = s->cbp_table[xy];
if(s->decoding_error!=DECODING_ACDC_LOST && s->qscale_table[xy] != s->qscale){
@@ -2542,8 +2542,8 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s,
}
}
}else if(!s->mb_intra){
-// s->mcsel= 0; //FIXME do we need to init that
-
+/* s->mcsel= 0; // FIXME do we need to init that */
+
s->mv_dir = MV_DIR_FORWARD;
if (mb_type&MB_TYPE_INTER4V) {
s->mv_type = MV_TYPE_8X8;
@@ -2566,7 +2566,7 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s,
int i;
s->mb_intra = 1;
s->ac_pred = s->pred_dir_table[xy]>>7;
-
+
/* decode each block */
for (i = 0; i < 6; i++) {
int ret= mpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, 1);
@@ -2585,13 +2585,13 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s,
}
#if 0
static inline void decode_interlaced_info(MpegEncContext *s, int cbp, int mb_type){
- s->mv_type= 0;
+ s->mv_type= 0;
if(!s->progressive_sequence){
if(cbp || s->mb_intra)
s->interlaced_dct= get_bits1(&s->gb);
-
+
if(!s->mb_intra){
- if( s->pict_type==P_TYPE //FIXME check that 4MV is forbidden
+ if( s->pict_type==P_TYPE /* FIXME check that 4MV is forbidden */
|| (s->pict_type==S_TYPE && s->vol_sprite_usage==GMC_SPRITE && !s->mcsel)
|| (s->pict_type==B_TYPE && mb_type!=0) ){
@@ -2608,9 +2608,9 @@ static inline void decode_interlaced_info(MpegEncContext *s, int cbp, int mb_typ
s->field_select[1][1]= get_bits1(&s->gb);
}
}else
- s->mv_type= 0;
+ s->mv_type= 0;
}
- }
+ }
}
}
#endif
@@ -2626,7 +2626,7 @@ int h263_decode_mb(MpegEncContext *s,
if(s->resync_marker){
if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){
- s->first_slice_line=0;
+ s->first_slice_line=0;
}
}
@@ -2643,7 +2643,7 @@ int h263_decode_mb(MpegEncContext *s,
s->mv_type = MV_TYPE_16X16;
if(s->pict_type==S_TYPE && s->vol_sprite_usage==GMC_SPRITE){
const int a= s->sprite_warping_accuracy;
-// int l = (1 << (s->f_code - 1)) * 32;
+/* int l = (1 << (s->f_code - 1)) * 32; */
PRINT_MB_TYPE("G");
s->mcsel=1;
if(s->divx_version==500 && s->divx_build==413){
@@ -2669,18 +2669,18 @@ int h263_decode_mb(MpegEncContext *s,
return 0;
}
cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
- //fprintf(stderr, "\tCBPC: %d", cbpc);
+ /* fprintf(stderr, "\tCBPC: %d", cbpc); */
if (cbpc < 0)
return -1;
if (cbpc > 20)
cbpc+=3;
else if (cbpc == 20)
fprintf(stderr, "Stuffing !");
-
+
dquant = cbpc & 8;
s->mb_intra = ((cbpc & 4) != 0);
if (s->mb_intra) goto intra;
-
+
if(s->pict_type==S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0)
s->mcsel= get_bits1(&s->gb);
else s->mcsel= 0;
@@ -2696,7 +2696,7 @@ int h263_decode_mb(MpegEncContext *s,
}
if((!s->progressive_sequence) && (cbp || s->workaround_bugs==2))
s->interlaced_dct= get_bits1(&s->gb);
-
+
s->mv_dir = MV_DIR_FORWARD;
if ((cbpc & 16) == 0) {
if(s->mcsel){
@@ -2704,7 +2704,7 @@ int h263_decode_mb(MpegEncContext *s,
PRINT_MB_TYPE("G");
/* 16x16 global motion prediction */
s->mv_type = MV_TYPE_16X16;
-// int l = (1 << (s->f_code - 1)) * 32;
+/* int l = (1 << (s->f_code - 1)) * 32; */
if(s->divx_version==500 && s->divx_build==413){
mx = s->sprite_offset[0][0] / (1<<(a-s->quarter_sample));
my = s->sprite_offset[0][1] / (1<<(a-s->quarter_sample));
@@ -2712,7 +2712,7 @@ int h263_decode_mb(MpegEncContext *s,
mx = RSHIFT(s->sprite_offset[0][0], a-s->quarter_sample);
my = RSHIFT(s->sprite_offset[0][1], a-s->quarter_sample);
}
-// int l = (1 << (s->f_code - 1)) * 32;
+/* int l = (1 << (s->f_code - 1)) * 32; */
s->mv[0][0][0] = mx;
s->mv[0][0][1] = my;
}else if((!s->progressive_sequence) && get_bits1(&s->gb)){
@@ -2724,12 +2724,12 @@ int h263_decode_mb(MpegEncContext *s,
s->field_select[0][1]= get_bits1(&s->gb);
h263_pred_motion(s, 0, &pred_x, &pred_y);
-
+
for(i=0; i<2; i++){
mx = h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff)
return -1;
-
+
my = h263_decode_motion(s, pred_y/2, s->f_code);
if (my >= 0xffff)
return -1;
@@ -2746,22 +2746,22 @@ int h263_decode_mb(MpegEncContext *s,
mx = h263p_decode_umotion(s, pred_x);
else
mx = h263_decode_motion(s, pred_x, s->f_code);
-
+
if (mx >= 0xffff)
return -1;
-
+
if (s->umvplus_dec)
my = h263p_decode_umotion(s, pred_y);
else
my = h263_decode_motion(s, pred_y, s->f_code);
-
+
if (my >= 0xffff)
return -1;
s->mv[0][0][0] = mx;
s->mv[0][0][1] = my;
if (s->umvplus_dec && (mx - pred_x) == 1 && (my - pred_y) == 1)
- skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */
+ skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */
}
} else {
PRINT_MB_TYPE("4");
@@ -2774,10 +2774,10 @@ int h263_decode_mb(MpegEncContext *s,
mx = h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff)
return -1;
-
+
if (s->umvplus_dec)
my = h263p_decode_umotion(s, pred_y);
- else
+ else
my = h263_decode_motion(s, pred_y, s->f_code);
if (my >= 0xffff)
return -1;
@@ -2790,27 +2790,27 @@ int h263_decode_mb(MpegEncContext *s,
}
}
} else if(s->pict_type==B_TYPE) {
- int modb1; // first bit of modb
- int modb2; // second bit of modb
+ int modb1; /* first bit of modb */
+ int modb2; /* second bit of modb */
int mb_type;
uint16_t time_pp;
uint16_t time_pb;
int xy;
- s->mb_intra = 0; //B-frames never contain intra blocks
- s->mcsel=0; // ... true gmc blocks
+ s->mb_intra = 0; /* B-frames never contain intra blocks */
+ s->mcsel=0; /* ... true gmc blocks */
if(s->mb_x==0){
for(i=0; i<2; i++){
- s->last_mv[i][0][0]=
- s->last_mv[i][0][1]=
- s->last_mv[i][1][0]=
+ s->last_mv[i][0][0]=
+ s->last_mv[i][0][1]=
+ s->last_mv[i][1][0]=
s->last_mv[i][1][1]= 0;
}
}
/* if we skipped it in the future P Frame than skip it now too */
- s->mb_skiped= s->mbskip_table[s->mb_y * s->mb_width + s->mb_x]; // Note, skiptab=0 if last was GMC
+ s->mb_skiped= s->mbskip_table[s->mb_y * s->mb_width + s->mb_x]; /* Note, skiptab=0 if last was GMC */
if(s->mb_skiped){
/* skip mb */
@@ -2827,13 +2827,13 @@ int h263_decode_mb(MpegEncContext *s,
return 0;
}
- modb1= get_bits1(&s->gb);
+ modb1= get_bits1(&s->gb);
if(modb1){
- mb_type=4; //like MB_TYPE_B_DIRECT but no vectors coded
+ mb_type=4; /* like MB_TYPE_B_DIRECT but no vectors coded */
cbp=0;
}else{
int field_mv;
-
+
modb2= get_bits1(&s->gb);
mb_type= get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1);
if(modb2) cbp= 0;
@@ -2880,7 +2880,7 @@ int h263_decode_mb(MpegEncContext *s,
s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx;
s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
}
-
+
if(mb_type!=MB_TYPE_B_FORW){
s->mv_dir |= MV_DIR_BACKWARD;
@@ -2896,7 +2896,7 @@ int h263_decode_mb(MpegEncContext *s,
if(mb_type!=MB_TYPE_B_BACKW){
s->mv_dir = MV_DIR_FORWARD;
-
+
for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code);
my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code);
@@ -2904,7 +2904,7 @@ int h263_decode_mb(MpegEncContext *s,
s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
}
}
-
+
if(mb_type!=MB_TYPE_B_FORW){
s->mv_dir |= MV_DIR_BACKWARD;
@@ -2919,24 +2919,24 @@ int h263_decode_mb(MpegEncContext *s,
PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "f" : (mb_type==MB_TYPE_B_BACKW ? "b" : "t"));
}
}
-
+
if(mb_type==4 || mb_type==MB_TYPE_B_DIRECT){
int mb_index= s->mb_x + s->mb_y*s->mb_width;
int i;
-
+
if(mb_type==4)
mx=my=0;
else{
mx = h263_decode_motion(s, 0, 1);
my = h263_decode_motion(s, 0, 1);
}
-
+
s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
xy= s->block_index[0];
time_pp= s->pp_time;
time_pb= s->pb_time;
-
- //FIXME avoid divides
+
+ /* FIXME avoid divides */
switch(s->co_located_type_table[mb_index]){
case 0:
s->mv_type= MV_TYPE_16X16;
@@ -2944,7 +2944,7 @@ int h263_decode_mb(MpegEncContext *s,
s->mv[0][0][1] = s->motion_val[xy][1]*time_pb/time_pp + my;
s->mv[1][0][0] = mx ? s->mv[0][0][0] - s->motion_val[xy][0]
: s->motion_val[xy][0]*(time_pb - time_pp)/time_pp;
- s->mv[1][0][1] = my ? s->mv[0][0][1] - s->motion_val[xy][1]
+ s->mv[1][0][1] = my ? s->mv[0][0][1] - s->motion_val[xy][1]
: s->motion_val[xy][1]*(time_pb - time_pp)/time_pp;
PRINT_MB_TYPE(mb_type==4 ? "D" : "S");
break;
@@ -2956,7 +2956,7 @@ int h263_decode_mb(MpegEncContext *s,
s->mv[0][i][1] = s->motion_val[xy][1]*time_pb/time_pp + my;
s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->motion_val[xy][0]
: s->motion_val[xy][0]*(time_pb - time_pp)/time_pp;
- s->mv[1][i][1] = my ? s->mv[0][i][1] - s->motion_val[xy][1]
+ s->mv[1][i][1] = my ? s->mv[0][i][1] - s->motion_val[xy][1]
: s->motion_val[xy][1]*(time_pb - time_pp)/time_pp;
}
PRINT_MB_TYPE("4");
@@ -2975,14 +2975,14 @@ int h263_decode_mb(MpegEncContext *s,
s->mv[0][i][1] = s->field_mv_table[mb_index][i][1]*time_pb/time_pp + my;
s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->field_mv_table[mb_index][i][0]
: s->field_mv_table[mb_index][i][0]*(time_pb - time_pp)/time_pp;
- s->mv[1][i][1] = my ? s->mv[0][i][1] - s->field_mv_table[mb_index][i][1]
+ s->mv[1][i][1] = my ? s->mv[0][i][1] - s->field_mv_table[mb_index][i][1]
: s->field_mv_table[mb_index][i][1]*(time_pb - time_pp)/time_pp;
}
PRINT_MB_TYPE("=");
break;
}
}
-
+
if(mb_type<0 || mb_type>4){
printf("illegal MB_type\n");
return -1;
@@ -3001,7 +3001,7 @@ intra:
s->h263_aic_dir = get_bits1(&s->gb);
}
PRINT_MB_TYPE(s->ac_pred ? "A" : "I");
-
+
cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
if(cbpy<0) return -1;
cbp = (cbpc & 3) | (cbpy << 2);
@@ -3080,7 +3080,7 @@ static int h263_decode_motion(MpegEncContext * s, int pred, int f_code)
val += 64;
if (pred > 32 && val > 63)
val -= 64;
-
+
}
return val;
}
@@ -3089,12 +3089,12 @@ static int h263_decode_motion(MpegEncContext * s, int pred, int f_code)
static int h263p_decode_umotion(MpegEncContext * s, int pred)
{
int code = 0, sign;
-
+
if (get_bits1(&s->gb)) /* Motion difference = 0 */
return pred;
-
+
code = 2 + get_bits1(&s->gb);
-
+
while (get_bits1(&s->gb))
{
code <<= 1;
@@ -3102,12 +3102,12 @@ static int h263p_decode_umotion(MpegEncContext * s, int pred)
}
sign = code & 1;
code >>= 1;
-
+
code = (sign) ? (pred - code) : (pred + code);
#ifdef DEBUG
fprintf(stderr,"H.263+ UMV Motion = %d\n", code);
#endif
- return code;
+ return code;
}
@@ -3123,7 +3123,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
rl = &rl_intra_aic;
i = 0;
if (s->ac_pred) {
- if (s->h263_aic_dir)
+ if (s->h263_aic_dir)
scan_table = ff_alternate_vertical_scan; /* left */
else
scan_table = ff_alternate_horizontal_scan; /* top */
@@ -3173,7 +3173,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
if (s->h263_rv10 && level == -128) {
/* XXX: should patch encoder too */
level = get_bits(&s->gb, 12);
- level= (level + ((-1)<<11)) ^ ((-1)<<11); //sign extension
+ level= (level + ((-1)<<11)) ^ ((-1)<<11); /* sign extension */
}
} else {
run = rl->table_run[code];
@@ -3191,7 +3191,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
break;
i++;
}
-not_coded:
+not_coded:
if (s->mb_intra && s->h263_aic) {
h263_pred_acdc(s, block, n);
i = 63;
@@ -3205,9 +3205,9 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
int level, pred, code;
UINT16 *dc_val;
- if (n < 4)
+ if (n < 4)
code = get_vlc2(&s->gb, dc_lum.table, DC_VLC_BITS, 1);
- else
+ else
code = get_vlc2(&s->gb, dc_chrom.table, DC_VLC_BITS, 1);
if (code < 0 || code > 9 /* && s->nbit<9 */){
fprintf(stderr, "illegal dc vlc\n");
@@ -3259,7 +3259,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
/* DC coef */
if(s->data_partitioning && s->pict_type!=B_TYPE){
level = s->dc_val[0][ s->block_index[n] ];
- if(n<4) level= (level + (s->y_dc_scale>>1))/s->y_dc_scale; //FIXME optimizs
+ if(n<4) level= (level + (s->y_dc_scale>>1))/s->y_dc_scale; /* FIXME optimizs */
else level= (level + (s->c_dc_scale>>1))/s->c_dc_scale;
dc_pred_dir= (s->pred_dir_table[s->mb_x + s->mb_y*s->mb_width]<<n)&32;
}else{
@@ -3269,14 +3269,14 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
}
block[0] = level;
i = 0;
- if (!coded)
+ if (!coded)
goto not_coded;
rl = &rl_intra;
rl_vlc = rl_intra.rl_vlc[0];
if(s->alternate_scan)
scan_table = ff_alternate_vertical_scan; /* left */
else if (s->ac_pred) {
- if (dc_pred_dir == 0)
+ if (dc_pred_dir == 0)
scan_table = ff_alternate_vertical_scan; /* left */
else
scan_table = ff_alternate_horizontal_scan; /* top */
@@ -3292,7 +3292,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
return 0;
}
rl = &rl_inter;
-
+
if(s->alternate_scan)
scan_table = ff_alternate_vertical_scan; /* left */
else
@@ -3301,7 +3301,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
if(s->mpeg_quant){
qmul=1;
qadd=0;
- rl_vlc = rl_inter.rl_vlc[0];
+ rl_vlc = rl_inter.rl_vlc[0];
}else{
qmul = s->qscale << 1;
qadd = (s->qscale - 1) | 1;
@@ -3330,21 +3330,21 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
fprintf(stderr, "1. marker bit missing in 3. esc\n");
return DECODING_AC_LOST;
}; SKIP_CACHE(re, &s->gb, 1);
-
+
level= SHOW_SBITS(re, &s->gb, 12); SKIP_CACHE(re, &s->gb, 12);
-
+
if(SHOW_UBITS(re, &s->gb, 1)==0){
fprintf(stderr, "2. marker bit missing in 3. esc\n");
return DECODING_AC_LOST;
}; LAST_SKIP_CACHE(re, &s->gb, 1);
-
+
SKIP_COUNTER(re, &s->gb, 1+12+1);
-
+
if(level*s->qscale>1024 || level*s->qscale<-1024){
fprintf(stderr, "|level| overflow in 3. esc, qp=%d\n", s->qscale);
return DECODING_AC_LOST;
}
-#if 1
+#if 1
{
const int abs_level= ABS(level);
if(abs_level<=MAX_LEVEL && run<=MAX_RUN && s->error_resilience>=0){
@@ -3378,7 +3378,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
SKIP_BITS(re, &s->gb, 2);
#endif
GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2);
- i+= run + rl->max_run[run>>7][level/qmul] +1; //FIXME opt indexing
+ i+= run + rl->max_run[run>>7][level/qmul] +1; /* FIXME opt indexing */
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
LAST_SKIP_BITS(re, &s->gb, 1);
}
@@ -3392,7 +3392,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
#endif
GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2);
i+= run;
- level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing
+ level = level + rl->max_level[run>>7][(run-1)&63] * qmul;/* FIXME opt indexing */
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
LAST_SKIP_BITS(re, &s->gb, 1);
}
@@ -3440,7 +3440,7 @@ int h263_decode_picture_header(MpegEncContext *s)
/* temporal reference */
s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
- /* PTYPE starts here */
+ /* PTYPE starts here */
if (get_bits1(&s->gb) != 1) {
/* marker */
fprintf(stderr, "Bad marker\n");
@@ -3456,7 +3456,7 @@ int h263_decode_picture_header(MpegEncContext *s)
/* Reset GOB number */
s->gob_number = 0;
-
+
format = get_bits(&s->gb, 3);
/*
0 forbidden
@@ -3472,12 +3472,12 @@ int h263_decode_picture_header(MpegEncContext *s)
height = h263_format[format][1];
if (!width)
return -1;
-
+
s->width = width;
s->height = height;
s->pict_type = I_TYPE + get_bits1(&s->gb);
- s->unrestricted_mv = get_bits1(&s->gb);
+ s->unrestricted_mv = get_bits1(&s->gb);
s->h263_long_vectors = s->unrestricted_mv;
if (get_bits1(&s->gb) != 0) {
@@ -3486,8 +3486,8 @@ int h263_decode_picture_header(MpegEncContext *s)
}
if (get_bits1(&s->gb) != 0) {
s->mv_type = MV_TYPE_8X8; /* Advanced prediction mode */
- }
-
+ }
+
if (get_bits1(&s->gb) != 0) {
fprintf(stderr, "H263 PB frame not supported\n");
return -1; /* not PB frame */
@@ -3496,14 +3496,14 @@ int h263_decode_picture_header(MpegEncContext *s)
skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */
} else {
int ufep;
-
+
/* H.263v2 */
s->h263_plus = 1;
ufep = get_bits(&s->gb, 3); /* Update Full Extended PTYPE */
- /* ufep other than 0 and 1 are reserved */
+ /* ufep other than 0 and 1 are reserved */
if (ufep == 1) {
- /* OPPTYPE */
+ /* OPPTYPE */
format = get_bits(&s->gb, 3);
dprintf("ufep=1, format: %d\n", format);
skip_bits(&s->gb,1); /* Custom PCF */
@@ -3515,7 +3515,7 @@ int h263_decode_picture_header(MpegEncContext *s)
if (get_bits1(&s->gb) != 0) { /* Advanced Intra Coding (AIC) */
s->h263_aic = 1;
}
-
+
skip_bits(&s->gb, 7);
/* these are the 7 bits: (in order of appearence */
/* Deblocking Filter */
@@ -3531,7 +3531,7 @@ int h263_decode_picture_header(MpegEncContext *s)
fprintf(stderr, "Bad UFEP type (%d)\n", ufep);
return -1;
}
-
+
/* MPPTYPE */
s->pict_type = get_bits(&s->gb, 3) + I_TYPE;
dprintf("pict_type: %d\n", s->pict_type);
@@ -3542,7 +3542,7 @@ int h263_decode_picture_header(MpegEncContext *s)
s->no_rounding = get_bits1(&s->gb);
dprintf("RTYPE: %d\n", s->no_rounding);
skip_bits(&s->gb, 4);
-
+
/* Get the picture dimensions */
if (ufep) {
if (format == 6) {
@@ -3579,7 +3579,7 @@ int h263_decode_picture_header(MpegEncContext *s)
skip_bits1(&s->gb); /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */
}
}
-
+
s->qscale = get_bits(&s->gb, 5);
}
/* PEI */
@@ -3587,9 +3587,9 @@ int h263_decode_picture_header(MpegEncContext *s)
skip_bits(&s->gb, 8);
}
s->f_code = 1;
-
+
if(s->h263_aic){
- s->y_dc_scale_table=
+ s->y_dc_scale_table=
s->c_dc_scale_table= h263_aic_dc_scale_table;
}else{
s->y_dc_scale_table=
@@ -3605,7 +3605,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
int a= 2<<s->sprite_warping_accuracy;
int rho= 3-s->sprite_warping_accuracy;
int r=16/a;
- const int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes
+ const int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; /* only true for rectangle shapes */
int d[4][2]={{0,0}, {0,0}, {0,0}, {0,0}};
int sprite_ref[4][2];
int virtual_ref[2][2];
@@ -3613,7 +3613,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
int alpha=0, beta=0;
int w= s->width;
int h= s->height;
-//printf("SP %d\n", s->sprite_warping_accuracy);
+/* printf("SP %d\n", s->sprite_warping_accuracy); */
for(i=0; i<s->num_sprite_warping_points; i++){
int length;
int x=0, y=0;
@@ -3621,33 +3621,33 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
length= get_vlc(&s->gb, &sprite_trajectory);
if(length){
x= get_bits(&s->gb, length);
-//printf("lx %d %d\n", length, x);
+/* printf("lx %d %d\n", length, x); */
if ((x >> (length - 1)) == 0) /* if MSB not set it is negative*/
x = - (x ^ ((1 << length) - 1));
}
if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(&s->gb); /* marker bit */
-
+
length= get_vlc(&s->gb, &sprite_trajectory);
if(length){
y=get_bits(&s->gb, length);
-//printf("ly %d %d\n", length, y);
+/* printf("ly %d %d\n", length, y); */
if ((y >> (length - 1)) == 0) /* if MSB not set it is negative*/
y = - (y ^ ((1 << length) - 1));
}
skip_bits1(&s->gb); /* marker bit */
-//printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy);
-//if(i>0 && (x!=0 || y!=0)) printf("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n");
-//x=y=0;
+/* printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy); */
+/* if(i>0 && (x!=0 || y!=0)) printf("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n"); */
+/* x=y=0; */
d[i][0]= x;
d[i][1]= y;
}
while((1<<alpha)<w) alpha++;
- while((1<<beta )<h) beta++; // there seems to be a typo in the mpeg4 std for the definition of w' and h'
+ while((1<<beta )<h) beta++; /* there seems to be a typo in the mpeg4 std for the definition of w' and h' */
w2= 1<<alpha;
h2= 1<<beta;
-// Note, the 4th point isnt used for GMC
+/* Note, the 4th point isnt used for GMC */
if(s->divx_version==500 && s->divx_build==413){
sprite_ref[0][0]= a*vop_ref[0][0] + d[0][0];
sprite_ref[0][1]= a*vop_ref[0][1] + d[0][1];
@@ -3665,18 +3665,18 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
}
/* sprite_ref[3][0]= (a>>1)*(2*vop_ref[3][0] + d[0][0] + d[1][0] + d[2][0] + d[3][0]);
sprite_ref[3][1]= (a>>1)*(2*vop_ref[3][1] + d[0][1] + d[1][1] + d[2][1] + d[3][1]); */
-
-// this is mostly identical to the mpeg4 std (and is totally unreadable because of that ...)
-// perhaps it should be reordered to be more readable ...
-// the idea behind this virtual_ref mess is to be able to use shifts later per pixel instead of divides
-// so the distance between points is converted from w&h based to w2&h2 based which are of the 2^x form
- virtual_ref[0][0]= 16*(vop_ref[0][0] + w2)
+
+/* this is mostly identical to the mpeg4 std (and is totally unreadable because of that ...) */
+/* perhaps it should be reordered to be more readable ... */
+/* the idea behind this virtual_ref mess is to be able to use shifts later per pixel instead of divides */
+/* so the distance between points is converted from w&h based to w2&h2 based which are of the 2^x form */
+ virtual_ref[0][0]= 16*(vop_ref[0][0] + w2)
+ ROUNDED_DIV(((w - w2)*(r*sprite_ref[0][0] - 16*vop_ref[0][0]) + w2*(r*sprite_ref[1][0] - 16*vop_ref[1][0])),w);
- virtual_ref[0][1]= 16*vop_ref[0][1]
+ virtual_ref[0][1]= 16*vop_ref[0][1]
+ ROUNDED_DIV(((w - w2)*(r*sprite_ref[0][1] - 16*vop_ref[0][1]) + w2*(r*sprite_ref[1][1] - 16*vop_ref[1][1])),w);
- virtual_ref[1][0]= 16*vop_ref[0][0]
+ virtual_ref[1][0]= 16*vop_ref[0][0]
+ ROUNDED_DIV(((h - h2)*(r*sprite_ref[0][0] - 16*vop_ref[0][0]) + h2*(r*sprite_ref[2][0] - 16*vop_ref[2][0])),h);
- virtual_ref[1][1]= 16*(vop_ref[0][1] + h2)
+ virtual_ref[1][1]= 16*(vop_ref[0][1] + h2)
+ ROUNDED_DIV(((h - h2)*(r*sprite_ref[0][1] - 16*vop_ref[0][1]) + h2*(r*sprite_ref[2][1] - 16*vop_ref[2][1])),h);
switch(s->num_sprite_warping_points)
@@ -3699,7 +3699,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
s->sprite_shift[1][0]= 0;
s->sprite_shift[1][1]= 0;
break;
- case 1: //GMC only
+ case 1: /* GMC only */
s->sprite_offset[0][0]= sprite_ref[0][0] - a*vop_ref[0][0];
s->sprite_offset[0][1]= sprite_ref[0][1] - a*vop_ref[0][1];
s->sprite_offset[1][0]= ((sprite_ref[0][0]>>1)|(sprite_ref[0][0]&1)) - a*(vop_ref[0][0]/2);
@@ -3718,7 +3718,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
s->sprite_shift[1][1]= 0;
break;
case 2:
- case 3: //FIXME
+ case 3: /* FIXME */
s->sprite_offset[0][0]= (sprite_ref[0][0]<<(alpha+rho))
+ ((-r*sprite_ref[0][0] + virtual_ref[0][0])*(-vop_ref[0][0])
+( r*sprite_ref[0][1] - virtual_ref[0][1])*(-vop_ref[0][1]));
@@ -3728,7 +3728,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
s->sprite_offset[1][0]= ((-r*sprite_ref[0][0] + virtual_ref[0][0])*(-2*vop_ref[0][0] + 1)
+( r*sprite_ref[0][1] - virtual_ref[0][1])*(-2*vop_ref[0][1] + 1)
+2*w2*r*sprite_ref[0][0] - 16*w2);
- s->sprite_offset[1][1]= ((-r*sprite_ref[0][1] + virtual_ref[0][1])*(-2*vop_ref[0][0] + 1)
+ s->sprite_offset[1][1]= ((-r*sprite_ref[0][1] + virtual_ref[0][1])*(-2*vop_ref[0][0] + 1)
+(-r*sprite_ref[0][0] + virtual_ref[0][0])*(-2*vop_ref[0][1] + 1)
+2*w2*r*sprite_ref[0][1] - 16*w2);
s->sprite_delta[0][0][0]= (-r*sprite_ref[0][0] + virtual_ref[0][0]);
@@ -3744,7 +3744,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
s->sprite_shift[1][0]= alpha+rho+2;
s->sprite_shift[1][1]= alpha+rho+2;
break;
-// case 3:
+/* case 3: */
break;
}
/*printf("%d %d\n", s->sprite_delta[0][0][0], a<<s->sprite_shift[0][0]);
@@ -3755,7 +3755,7 @@ printf("%d %d\n", s->sprite_delta[1][0][0], a<<s->sprite_shift[1][0]);
printf("%d %d\n", s->sprite_delta[1][0][1], 0);
printf("%d %d\n", s->sprite_delta[1][1][0], 0);
printf("%d %d\n", s->sprite_delta[1][1][1], a<<s->sprite_shift[1][1]);*/
- /* try to simplify the situation */
+ /* try to simplify the situation */
if( s->sprite_delta[0][0][0] == a<<s->sprite_shift[0][0]
&& s->sprite_delta[0][0][1] == 0
&& s->sprite_delta[0][1][0] == 0
@@ -3786,7 +3786,7 @@ printf("%d %d\n", s->sprite_delta[1][1][1], a<<s->sprite_shift[1][1]);*/
else
s->real_sprite_warping_points= s->num_sprite_warping_points;
-//printf("%d %d %d %d\n", d[0][0], d[0][1], s->sprite_offset[0][0], s->sprite_offset[0][1]);
+/* printf("%d %d %d %d\n", d[0][0], d[0][1], s->sprite_offset[0][0], s->sprite_offset[0][1]); */
}
/* decode mpeg4 VOP header */
@@ -3817,8 +3817,8 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
}
}
}
-//printf("startcode %X %d\n", startcode, get_bits_count(&s->gb));
- if (startcode == 0x120) { // Video Object Layer
+/* printf("startcode %X %d\n", startcode, get_bits_count(&s->gb)); */
+ if (startcode == 0x120) { /* Video Object Layer */
int width, height, vo_ver_id;
/* vol header */
@@ -3830,11 +3830,11 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
} else {
vo_ver_id = 1;
}
-//printf("vo type:%d\n",s->vo_type);
+/* printf("vo type:%d\n",s->vo_type); */
s->aspect_ratio_info= get_bits(&s->gb, 4);
- if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){
- s->aspected_width = get_bits(&s->gb, 8); // par_width
- s->aspected_height = get_bits(&s->gb, 8); // par_height
+ if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){
+ s->aspected_width = get_bits(&s->gb, 8); /* par_width */
+ s->aspected_height = get_bits(&s->gb, 8); /* par_height */
}
if ((s->vol_control_parameters=get_bits1(&s->gb))) { /* vol control parameter */
@@ -3854,10 +3854,10 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
get_bits(&s->gb, 11); /* first_half_vbv_occupancy */
skip_bits1(&s->gb); /* marker */
get_bits(&s->gb, 15); /* latter_half_vbv_occupancy */
- skip_bits1(&s->gb); /* marker */
+ skip_bits1(&s->gb); /* marker */
}
}else{
- // set low delay flag only once so the smart? low delay detection wont be overriden
+ /* set low delay flag only once so the smart? low delay detection wont be overriden */
if(s->picture_number==0)
s->low_delay=0;
}
@@ -3866,13 +3866,13 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
if(s->shape != RECT_SHAPE) printf("only rectangular vol supported\n");
if(s->shape == GRAY_SHAPE && vo_ver_id != 1){
printf("Gray shape not supported\n");
- skip_bits(&s->gb, 4); //video_object_layer_shape_extension
+ skip_bits(&s->gb, 4); /* video_object_layer_shape_extension */
}
skip_bits1(&s->gb); /* marker */
-
+
s->time_increment_resolution = get_bits(&s->gb, 16);
-
+
s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1;
if (s->time_increment_bits < 1)
s->time_increment_bits = 1;
@@ -3892,10 +3892,10 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
if(width && height){ /* they should be non zero but who knows ... */
s->width = width;
s->height = height;
-// printf("width/height: %d %d\n", width, height);
+/* printf("width/height: %d %d\n", width, height); */
}
}
-
+
s->progressive_sequence= get_bits1(&s->gb)^1;
if(!get_bits1(&s->gb)) printf("OBMC not supported (very likely buggy encoder)\n"); /* OBMC Disable */
if (vo_ver_id == 1) {
@@ -3919,10 +3919,10 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
s->sprite_warping_accuracy = get_bits(&s->gb, 2);
s->sprite_brightness_change= get_bits1(&s->gb);
if(s->vol_sprite_usage==STATIC_SPRITE)
- s->low_latency_sprite= get_bits1(&s->gb);
+ s->low_latency_sprite= get_bits1(&s->gb);
}
- // FIXME sadct disable bit if verid!=1 && shape not rect
-
+ /* FIXME sadct disable bit if verid!=1 && shape not rect */
+
if (get_bits1(&s->gb) == 1) { /* not_8_bit */
s->quant_precision = get_bits(&s->gb, 4); /* quant_precision */
if(get_bits(&s->gb, 4)!=8) printf("N-bit not supported\n"); /* bits_per_pixel */
@@ -3930,18 +3930,18 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
} else {
s->quant_precision = 5;
}
-
- // FIXME a bunch of grayscale shape things
+
+ /* FIXME a bunch of grayscale shape things */
if((s->mpeg_quant=get_bits1(&s->gb))){ /* vol_quant_type */
int i, j, v;
-
+
/* load default matrixes */
for(i=0; i<64; i++){
v= ff_mpeg4_default_intra_matrix[i];
s->intra_matrix[i]= v;
s->chroma_intra_matrix[i]= v;
-
+
v= ff_mpeg4_default_non_intra_matrix[i];
s->inter_matrix[i]= v;
s->chroma_inter_matrix[i]= v;
@@ -3978,7 +3978,7 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
}
}
- // FIXME a bunch of grayscale shape things
+ /* FIXME a bunch of grayscale shape things */
}
if(vo_ver_id != 1)
@@ -3996,7 +3996,7 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
printf("reversible vlc not supported\n");
}
}
-
+
if(vo_ver_id != 1) {
s->new_pred= get_bits1(&s->gb);
if(s->new_pred){
@@ -4023,19 +4023,19 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
int v_sampling_factor_n= get_bits(&s->gb, 5);
int v_sampling_factor_m= get_bits(&s->gb, 5);
s->enhancement_type= get_bits1(&s->gb);
- // bin shape stuff FIXME
+ /* bin shape stuff FIXME */
printf("scalability not supported\n");
}
}
-//printf("end Data %X %d\n", show_bits(&s->gb, 32), get_bits_count(&s->gb)&0x7);
+/* printf("end Data %X %d\n", show_bits(&s->gb, 32), get_bits_count(&s->gb)&0x7); */
goto redo;
- } else if (startcode == 0x1b2) { //userdata
+ } else if (startcode == 0x1b2) { /* userdata */
char buf[256];
int i;
int e;
int ver, build;
-//printf("user Data %X\n", show_bits(&s->gb, 32));
+/* printf("user Data %X\n", show_bits(&s->gb, 32)); */
buf[0]= show_bits(&s->gb, 8);
for(i=1; i<256; i++){
buf[i]= show_bits(&s->gb, 16)&0xFF;
@@ -4056,31 +4056,31 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
}
}
}
-//printf("User Data: %s\n", buf);
+/* printf("User Data: %s\n", buf); */
goto redo;
- } else if (startcode != 0x1b6) { //VOP
+ } else if (startcode != 0x1b6) { /* VOP */
goto redo;
}
s->pict_type = get_bits(&s->gb, 2) + I_TYPE; /* pict type: I = 0 , P = 1 */
-//if(s->pict_type!=I_TYPE) return FRAME_SKIPED;
+/* if(s->pict_type!=I_TYPE) return FRAME_SKIPED; */
if(s->pict_type==B_TYPE && s->low_delay && s->vol_control_parameters==0){
printf("low_delay flag set, but shouldnt, clearing it\n");
s->low_delay=0;
}
-// printf("pic: %d, qpel:%d part:%d resync:%d\n", s->pict_type, s->quarter_sample, s->data_partitioning, s->resync_marker);
-
+/* printf("pic: %d, qpel:%d part:%d resync:%d\n", s->pict_type, s->quarter_sample, s->data_partitioning, s->resync_marker); */
+
if(s->time_increment_resolution==0){
s->time_increment_resolution=1;
-// fprintf(stderr, "time_increment_resolution is illegal\n");
+/* fprintf(stderr, "time_increment_resolution is illegal\n"); */
}
time_incr=0;
- while (get_bits1(&s->gb) != 0)
+ while (get_bits1(&s->gb) != 0)
time_incr++;
check_marker(&s->gb, "before time_increment");
time_increment= get_bits(&s->gb, s->time_increment_bits);
-//printf(" type:%d incr:%d increment:%d\n", s->pict_type, time_incr, time_increment);
+/* printf(" type:%d incr:%d increment:%d\n", s->pict_type, time_incr, time_increment); */
if(s->pict_type!=B_TYPE){
s->last_time_base= s->time_base;
s->time_base+= time_incr;
@@ -4096,21 +4096,21 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
s->time= (s->last_time_base + time_incr)*s->time_increment_resolution + time_increment;
s->pb_time= s->pp_time - (s->last_non_b_time - s->time);
if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){
-// printf("messed up order, seeking?, skiping current b frame\n");
+/* printf("messed up order, seeking?, skiping current b frame\n"); */
return FRAME_SKIPED;
}
-
+
if(s->t_frame==0) s->t_frame= s->time - s->last_time_base;
- if(s->t_frame==0) s->t_frame=1; // 1/0 protection
-//printf("%Ld %Ld %d %d\n", s->last_non_b_time, s->time, s->pp_time, s->t_frame); fflush(stdout);
- s->pp_field_time= ( ROUNDED_DIV(s->last_non_b_time, s->t_frame)
+ if(s->t_frame==0) s->t_frame=1; /* 1/0 protection */
+/* printf("%Ld %Ld %d %d\n", s->last_non_b_time, s->time, s->pp_time, s->t_frame); fflush(stdout); */
+ s->pp_field_time= ( ROUNDED_DIV(s->last_non_b_time, s->t_frame)
- ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
- s->pb_field_time= ( ROUNDED_DIV(s->time, s->t_frame)
+ s->pb_field_time= ( ROUNDED_DIV(s->time, s->t_frame)
- ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
}
-
+
s->avctx->pts= s->time*1000LL*1000LL / s->time_increment_resolution;
-
+
if(check_marker(&s->gb, "before vop_coded")==0 && s->picture_number==0){
printf("hmm, seems the headers arnt complete, trying to guess time_increment_bits\n");
for(s->time_increment_bits++ ;s->time_increment_bits<16; s->time_increment_bits++){
@@ -4121,8 +4121,8 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
/* vop coded */
if (get_bits1(&s->gb) != 1)
goto redo;
-//printf("time %d %d %d || %Ld %Ld %Ld\n", s->time_increment_bits, s->time_increment_resolution, s->time_base,
-//s->time, s->last_non_b_time, s->last_non_b_time - s->pp_time);
+/* printf("time %d %d %d || %Ld %Ld %Ld\n", s->time_increment_bits, s->time_increment_resolution, s->time_base, */
+/* s->time, s->last_non_b_time, s->last_non_b_time - s->pp_time); */
if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == P_TYPE
|| (s->pict_type == S_TYPE && s->vol_sprite_usage==GMC_SPRITE))) {
/* rounding type for motion estimation */
@@ -4130,12 +4130,12 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
} else {
s->no_rounding = 0;
}
-//FIXME reduced res stuff
+/* FIXME reduced res stuff */
if (s->shape != RECT_SHAPE) {
if (s->vol_sprite_usage != 1 || s->pict_type != I_TYPE) {
int width, height, hor_spat_ref, ver_spat_ref;
-
+
width = get_bits(&s->gb, 13);
skip_bits1(&s->gb); /* marker */
height = get_bits(&s->gb, 13);
@@ -4145,17 +4145,17 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
ver_spat_ref = get_bits(&s->gb, 13); /* ver_spat_ref */
}
skip_bits1(&s->gb); /* change_CR_disable */
-
+
if (get_bits1(&s->gb) != 0) {
skip_bits(&s->gb, 8); /* constant_alpha_value */
}
}
-//FIXME complexity estimation stuff
-
+/* FIXME complexity estimation stuff */
+
if (s->shape != BIN_ONLY_SHAPE) {
int t;
t=get_bits(&s->gb, 3); /* intra dc VLC threshold */
-//printf("threshold %d\n", t);
+/* printf("threshold %d\n", t); */
if(!s->progressive_sequence){
s->top_field_first= get_bits1(&s->gb);
s->alternate_scan= get_bits1(&s->gb);
@@ -4178,32 +4178,32 @@ int mpeg4_decode_picture_header(MpegEncContext * s)
s->qscale = get_bits(&s->gb, 5);
if(s->qscale==0){
printf("Error, header damaged or not MPEG4 header (qscale=0)\n");
- return -1; // makes no sense to continue, as there is nothing left from the image then
+ return -1; /* makes no sense to continue, as there is nothing left from the image then */
}
-
+
if (s->pict_type != I_TYPE) {
s->f_code = get_bits(&s->gb, 3); /* fcode_for */
if(s->f_code==0){
printf("Error, header damaged or not MPEG4 header (f_code=0)\n");
- return -1; // makes no sense to continue, as the MV decoding will break very quickly
+ return -1; /* makes no sense to continue, as the MV decoding will break very quickly */
}
}else
s->f_code=1;
-
+
if (s->pict_type == B_TYPE) {
s->b_code = get_bits(&s->gb, 3);
}else
s->b_code=1;
#if 0
-printf("qp:%d fc:%d bc:%d type:%s size:%d pro:%d alt:%d top:%d qpel:%d part:%d resync:%d\n",
- s->qscale, s->f_code, s->b_code,
- s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")),
- s->gb.size,s->progressive_sequence, s->alternate_scan, s->top_field_first,
- s->quarter_sample, s->data_partitioning, s->resync_marker);
+printf("qp:%d fc:%d bc:%d type:%s size:%d pro:%d alt:%d top:%d qpel:%d part:%d resync:%d\n",
+ s->qscale, s->f_code, s->b_code,
+ s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")),
+ s->gb.size,s->progressive_sequence, s->alternate_scan, s->top_field_first,
+ s->quarter_sample, s->data_partitioning, s->resync_marker);
#endif
if(!s->scalability){
if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) {
- skip_bits1(&s->gb); // vop shape coding type
+ skip_bits1(&s->gb); /* vop shape coding type */
}
}else{
if(s->enhancement_type){
@@ -4212,19 +4212,19 @@ printf("qp:%d fc:%d bc:%d type:%s size:%d pro:%d alt:%d top:%d qpel:%d part:%d r
printf("load backward shape isnt supported\n");
}
}
- skip_bits(&s->gb, 2); //ref_select_code
+ skip_bits(&s->gb, 2); /* ref_select_code */
}
}
/* detect buggy encoders which dont set the low_delay flag (divx4/xvid/opendivx)*/
- // note we cannot detect divx5 without b-frames easyly (allthough its buggy too)
+ /* note we cannot detect divx5 without b-frames easyly (allthough its buggy too) */
if(s->vo_type==0 && s->vol_control_parameters==0 && s->divx_version==0 && s->picture_number==0){
printf("looks like this file was encoded with (divx4/(old)xvid/opendivx) -> forcing low_delay flag\n");
s->low_delay=1;
}
- s->picture_number++; // better than pic number==0 allways ;)
+ s->picture_number++; /* better than pic number==0 allways ;) */
- s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support
+ s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; /* FIXME add short header support */
s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
if(s->divx_version==0 || s->divx_version < 500){
@@ -4266,8 +4266,8 @@ int intel_h263_decode_picture_header(MpegEncContext *s)
s->h263_plus = 0;
s->pict_type = I_TYPE + get_bits1(&s->gb);
-
- s->unrestricted_mv = get_bits1(&s->gb);
+
+ s->unrestricted_mv = get_bits1(&s->gb);
s->h263_long_vectors = s->unrestricted_mv;
if (get_bits1(&s->gb) != 0) {
diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c
index ff1c3a383..b4415227f 100644
--- a/src/libffmpeg/libavcodec/mpegvideo.c
+++ b/src/libffmpeg/libavcodec/mpegvideo.c
@@ -27,17 +27,17 @@
#endif
static void encode_picture(MpegEncContext *s, int picture_number);
-static void dct_unquantize_mpeg1_c(MpegEncContext *s,
+static void dct_unquantize_mpeg1_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale);
static void dct_unquantize_mpeg2_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale);
-static void dct_unquantize_h263_c(MpegEncContext *s,
+static void dct_unquantize_h263_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale);
static void draw_edges_c(UINT8 *buf, int wrap, int width, int height, int w);
static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
void (*draw_edges)(UINT8 *buf, int wrap, int width, int height, int w)= draw_edges_c;
-static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int block_w, int block_h,
+static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int block_w, int block_h,
int src_x, int src_y, int w, int h);
#define EDGE_WIDTH 16
@@ -89,8 +89,8 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16
/* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
/* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
/* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
-
- qmat[qscale][j] = (int)((UINT64_C(1) << QMAT_SHIFT) /
+
+ qmat[qscale][j] = (int)((UINT64_C(1) << QMAT_SHIFT) /
(qscale * quant_matrix[j]));
}
} else if (s->fdct == fdct_ifast) {
@@ -100,8 +100,8 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16
/* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
/* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
/* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
-
- qmat[qscale][j] = (int)((UINT64_C(1) << (QMAT_SHIFT + 14)) /
+
+ qmat[qscale][j] = (int)((UINT64_C(1) << (QMAT_SHIFT + 14)) /
(aanscales[i] * qscale * quant_matrix[j]));
}
} else {
@@ -120,7 +120,7 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16
}
}
}
-// move into common.c perhaps
+// move into common.c perhaps
#define CHECKED_ALLOCZ(p, size)\
{\
p= av_mallocz(size);\
@@ -145,7 +145,7 @@ int MPV_common_init(MpegEncContext *s)
s->fdct = fdct_ifast;
else
s->fdct = ff_jpeg_fdct_islow;
-
+
#ifdef HAVE_MMX
MPV_common_init_mmx(s);
#endif
@@ -158,7 +158,7 @@ int MPV_common_init(MpegEncContext *s)
s->mb_width = (s->width + 15) / 16;
s->mb_height = (s->height + 15) / 16;
-
+
/* set default edge pos, will be overriden in decode_header if needed */
s->h_edge_pos= s->mb_width*16;
s->v_edge_pos= s->mb_height*16;
@@ -181,14 +181,14 @@ int MPV_common_init(MpegEncContext *s)
s->last_picture_base[i] = pict;
s->last_picture[i] = pict + pict_start;
if(i>0) memset(s->last_picture_base[i], 128, c_size);
-
+
CHECKED_ALLOCZ(pict, c_size)
s->next_picture_base[i] = pict;
s->next_picture[i] = pict + pict_start;
if(i>0) memset(s->next_picture_base[i], 128, c_size);
-
+
if (s->has_b_frames || s->codec_id==CODEC_ID_MPEG4) {
- /* Note the MPEG4 stuff is here cuz of buggy encoders which dont set the low_delay flag but
+ /* Note the MPEG4 stuff is here cuz of buggy encoders which dont set the low_delay flag but
do low-delay encoding, so we cant allways distinguish b-frame containing streams from low_delay streams */
CHECKED_ALLOCZ(pict, c_size)
s->aux_picture_base[i] = pict;
@@ -198,13 +198,13 @@ int MPV_common_init(MpegEncContext *s)
}
s->ip_buffer_count= 2;
}
-
+
CHECKED_ALLOCZ(s->edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance
-
+
if (s->encoding) {
int j;
int mv_table_size= (s->mb_width+2)*(s->mb_height+2);
-
+
CHECKED_ALLOCZ(s->mb_var , s->mb_num * sizeof(INT16))
CHECKED_ALLOCZ(s->mc_mb_var, s->mb_num * sizeof(INT16))
@@ -219,7 +219,7 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->b_direct_mv_table , mv_table_size * 2 * sizeof(INT16))
CHECKED_ALLOCZ(s->me_scratchpad, s->linesize*16*3*sizeof(uint8_t))
-
+
CHECKED_ALLOCZ(s->me_map , ME_MAP_SIZE*sizeof(uint32_t))
CHECKED_ALLOCZ(s->me_score_map, ME_MAP_SIZE*sizeof(uint16_t))
@@ -244,13 +244,13 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->tex_pb_buffer, PB_BUFFER_SIZE);
CHECKED_ALLOCZ( s->pb2_buffer, PB_BUFFER_SIZE);
}
-
+
if(s->msmpeg4_version){
CHECKED_ALLOCZ(s->ac_stats, 2*2*(MAX_LEVEL+1)*(MAX_RUN+1)*2*sizeof(int));
}
CHECKED_ALLOCZ(s->avctx->stats_out, 256);
}
-
+
if (s->out_format == FMT_H263 || s->encoding) {
int size;
/* Allocate MB type table */
@@ -270,7 +270,7 @@ int MPV_common_init(MpegEncContext *s)
if (s->h263_pred || s->h263_plus) {
int y_size, c_size, i, size;
-
+
/* dc values */
y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2);
@@ -286,29 +286,29 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->ac_val[0], size * sizeof(INT16) * 16);
s->ac_val[1] = s->ac_val[0] + y_size;
s->ac_val[2] = s->ac_val[1] + c_size;
-
+
/* cbp values */
CHECKED_ALLOCZ(s->coded_block, y_size);
-
+
/* divx501 bitstream reorder buffer */
CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE);
-
+
/* cbp, ac_pred, pred_dir */
CHECKED_ALLOCZ(s->cbp_table , s->mb_num * sizeof(UINT8))
CHECKED_ALLOCZ(s->pred_dir_table, s->mb_num * sizeof(UINT8))
}
CHECKED_ALLOCZ(s->qscale_table , s->mb_num * sizeof(UINT8))
-
+
/* which mb is a intra block */
CHECKED_ALLOCZ(s->mbintra_table, s->mb_num);
memset(s->mbintra_table, 1, s->mb_num);
-
+
/* default structure is frame */
s->picture_structure = PICT_FRAME;
-
+
/* init macroblock skip table */
CHECKED_ALLOCZ(s->mbskip_table, s->mb_num);
-
+
s->block= s->blocks[0];
s->context_initialized = 1;
@@ -348,7 +348,7 @@ void MPV_common_end(MpegEncContext *s)
av_freep(&s->me_scratchpad);
av_freep(&s->me_map);
av_freep(&s->me_score_map);
-
+
av_freep(&s->mbskip_table);
av_freep(&s->bitstream_buffer);
av_freep(&s->tex_pb_buffer);
@@ -359,7 +359,7 @@ void MPV_common_end(MpegEncContext *s)
av_freep(&s->field_select_table);
av_freep(&s->avctx->stats_out);
av_freep(&s->ac_stats);
-
+
for(i=0;i<3;i++) {
int j;
if(!(s->flags&CODEC_FLAG_DR1)){
@@ -431,17 +431,17 @@ int MPV_encode_init(AVCodecContext *avctx)
} else {
s->intra_only = 0;
}
-
+
/* ME algorithm */
if (avctx->me_method == 0)
/* For compatibility */
s->me_method = motion_estimation_method;
else
s->me_method = avctx->me_method;
-
+
/* Fixed QSCALE */
s->fixed_qscale = (avctx->flags & CODEC_FLAG_QSCALE);
-
+
switch(avctx->codec->id) {
case CODEC_ID_MPEG1VIDEO:
s->out_format = FMT_MPEG1;
@@ -454,10 +454,10 @@ int MPV_encode_init(AVCodecContext *avctx)
s->mjpeg_data_only_frames = 0; /* write all the needed headers */
s->mjpeg_vsample[0] = 2; /* set up default sampling factors */
s->mjpeg_vsample[1] = 1; /* the only currently supported values */
- s->mjpeg_vsample[2] = 1;
+ s->mjpeg_vsample[2] = 1;
s->mjpeg_hsample[0] = 2;
- s->mjpeg_hsample[1] = 1;
- s->mjpeg_hsample[2] = 1;
+ s->mjpeg_hsample[1] = 1;
+ s->mjpeg_hsample[2] = 1;
if (mjpeg_init(s) < 0)
return -1;
avctx->delay=0;
@@ -473,11 +473,11 @@ int MPV_encode_init(AVCodecContext *avctx)
case CODEC_ID_H263P:
s->out_format = FMT_H263;
s->rtp_mode = 1;
- s->rtp_payload_size = 1200;
+ s->rtp_payload_size = 1200;
s->h263_plus = 1;
s->unrestricted_mv = 1;
s->h263_aic = 1;
-
+
/* These are just to be sure */
s->umvplus = 0;
s->umvplus_dec = 0;
@@ -494,7 +494,7 @@ int MPV_encode_init(AVCodecContext *avctx)
s->unrestricted_mv = 1;
s->has_b_frames= s->max_b_frames ? 1 : 0;
s->low_delay=0;
- avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
+ avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
break;
case CODEC_ID_MSMPEG4V1:
s->out_format = FMT_H263;
@@ -539,7 +539,7 @@ int MPV_encode_init(AVCodecContext *avctx)
default:
return -1;
}
-
+
{ /* set up some save defaults, some codecs might override them later */
static int done=0;
if(!done){
@@ -557,7 +557,7 @@ int MPV_encode_init(AVCodecContext *avctx)
s->fcode_tab= default_fcode_tab;
s->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
-
+
if (s->out_format == FMT_H263)
h263_encode_init(s);
else if (s->out_format == FMT_MPEG1)
@@ -573,7 +573,7 @@ int MPV_encode_init(AVCodecContext *avctx)
/* init */
if (MPV_common_init(s) < 0)
return -1;
-
+
/* init default q matrix */
for(i=0;i<64;i++) {
if(s->codec_id==CODEC_ID_MPEG4 && s->mpeg_quant){
@@ -591,9 +591,9 @@ int MPV_encode_init(AVCodecContext *avctx)
/* precompute matrix */
/* for mjpeg, we do include qscale in the matrix */
if (s->out_format != FMT_MJPEG) {
- convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias,
+ convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias,
s->intra_matrix, s->intra_quant_bias);
- convert_matrix(s, s->q_inter_matrix, s->q_inter_matrix16, s->q_inter_matrix16_bias,
+ convert_matrix(s, s->q_inter_matrix, s->q_inter_matrix16, s->q_inter_matrix16_bias,
s->inter_matrix, s->inter_quant_bias);
}
@@ -623,7 +623,7 @@ int MPV_encode_end(AVCodecContext *avctx)
MPV_common_end(s);
if (s->out_format == FMT_MJPEG)
mjpeg_close(s);
-
+
return 0;
}
@@ -674,12 +674,12 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->ip_buffer_count= avctx->dr_ip_buffer_count;
}
avctx->dr_ip_buffer_count= s->ip_buffer_count;
-
+
if (s->pict_type == B_TYPE) {
for(i=0;i<3;i++) {
if(avctx->flags&CODEC_FLAG_DR1)
s->aux_picture[i]= avctx->dr_buffer[i];
-
+
//FIXME the following should never be needed, the decoder should drop b frames if no reference is available
if(s->next_picture[i]==NULL)
s->next_picture[i]= s->aux_picture[i];
@@ -719,7 +719,7 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->dct_unquantize = s->dct_unquantize_mpeg2;
else
s->dct_unquantize = s->dct_unquantize_h263;
- }else
+ }else
s->dct_unquantize = s->dct_unquantize_mpeg1;
}
@@ -736,7 +736,7 @@ void MPV_frame_end(MpegEncContext *s)
draw_edges(s->current_picture[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
}
emms_c();
-
+
s->last_pict_type = s->pict_type;
if(s->pict_type!=B_TYPE){
s->last_non_b_pict_type= s->pict_type;
@@ -749,7 +749,7 @@ void MPV_frame_end(MpegEncContext *s)
void reorder_input(MpegEncContext *s, AVPicture *pict)
{
int i, j, index;
-
+
if(s->max_b_frames > FF_MAX_B_FRAMES) s->max_b_frames= FF_MAX_B_FRAMES;
// delay= s->max_b_frames+1; (or 0 if no b frames cuz decoder diff)
@@ -761,17 +761,17 @@ void reorder_input(MpegEncContext *s, AVPicture *pict)
s->coded_order[j].pict_type=0;
switch(s->input_pict_type){
- default:
+ default:
case I_TYPE:
case S_TYPE:
case P_TYPE:
index= s->max_b_frames - s->b_frames_since_non_b;
s->b_frames_since_non_b=0;
- break;
+ break;
case B_TYPE:
index= s->max_b_frames + 1;
s->b_frames_since_non_b++;
- break;
+ break;
}
//printf("index:%d type:%d strides: %d %d\n", index, s->input_pict_type, pict->linesize[0], s->linesize);
if( (index==0 || (s->flags&CODEC_FLAG_INPUT_PRESERVED))
@@ -861,9 +861,9 @@ int MPV_encode_picture(AVCodecContext *avctx,
if(s->input_pict_type==I_TYPE)
s->input_picture_in_gop_number=0;
-
+
reorder_input(s, pict);
-
+
/* output? */
if(s->coded_order[0].picture[0]){
@@ -877,7 +877,7 @@ int MPV_encode_picture(AVCodecContext *avctx,
MPV_frame_start(s, avctx);
encode_picture(s, s->picture_number);
-
+
avctx->real_pict_num = s->picture_number;
avctx->header_bits = s->header_bits;
avctx->mv_bits = s->mv_bits;
@@ -894,10 +894,10 @@ int MPV_encode_picture(AVCodecContext *avctx,
mjpeg_picture_trailer(s);
avctx->quality = s->qscale;
-
+
if(s->flags&CODEC_FLAG_PASS1)
ff_write_pass1_stats(s);
-
+
}
s->input_picture_number++;
@@ -905,10 +905,10 @@ int MPV_encode_picture(AVCodecContext *avctx,
flush_put_bits(&s->pb);
s->frame_bits = (pbBufPtr(&s->pb) - s->pb.buf) * 8;
-
+
s->total_bits += s->frame_bits;
avctx->frame_bits = s->frame_bits;
-//printf("fcode: %d, type: %d, head: %d, mv: %d, misc: %d, frame: %d, itex: %d, ptex: %d\n",
+//printf("fcode: %d, type: %d, head: %d, mv: %d, misc: %d, frame: %d, itex: %d, ptex: %d\n",
//s->f_code, avctx->key_frame, s->header_bits, s->mv_bits, s->misc_bits, s->frame_bits, s->i_tex_bits, s->p_tex_bits);
#if 0 //dump some stats to stats.txt for testing/debuging
if(s->max_b_frames==0)
@@ -955,7 +955,7 @@ static inline void gmc1_motion(MpegEncContext *s,
src_y = clip(src_y, -16, s->height);
if (src_y == s->height)
motion_y =0;
-
+
linesize = s->linesize;
uvlinesize = s->uvlinesize;
ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset;
@@ -992,23 +992,23 @@ static inline void gmc1_motion(MpegEncContext *s,
ptr= s->edge_emu_buffer;
}
gmc1(dest_cb + (dest_offset>>1), ptr, uvlinesize, h>>1, motion_x&15, motion_y&15, s->no_rounding);
-
+
ptr = ref_picture[2] + offset;
if(emu){
emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
ptr= s->edge_emu_buffer;
}
gmc1(dest_cr + (dest_offset>>1), ptr, uvlinesize, h>>1, motion_x&15, motion_y&15, s->no_rounding);
-
+
return;
}
-static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int block_w, int block_h,
+static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int block_w, int block_h,
int src_x, int src_y, int w, int h){
int x, y;
int start_y, start_x, end_y, end_x;
UINT8 *buf= s->edge_emu_buffer;
-
+
if(src_y>= h){
src+= (h-1-src_y)*linesize;
src_y=h-1;
@@ -1049,13 +1049,13 @@ static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int bl
buf[x + y*linesize]= buf[x + (end_y-1)*linesize];
}
}
-
+
for(y=0; y<block_h; y++){
//left
for(x=0; x<start_x; x++){
buf[x + y*linesize]= buf[start_x + y*linesize];
}
-
+
//right
for(x=end_x; x<block_w; x++){
buf[x + y*linesize]= buf[end_x - 1 + y*linesize];
@@ -1075,7 +1075,7 @@ static inline void mpeg_motion(MpegEncContext *s,
UINT8 *ptr;
int dxy, offset, mx, my, src_x, src_y, height, v_edge_pos, linesize, uvlinesize;
int emu=0;
-#if 0
+#if 0
if(s->quarter_sample)
{
motion_x>>=1;
@@ -1085,7 +1085,7 @@ if(s->quarter_sample)
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
src_x = s->mb_x * 16 + (motion_x >> 1);
src_y = s->mb_y * (16 >> field_based) + (motion_y >> 1);
-
+
/* WARNING: do no forget half pels */
height = s->height >> field_based;
v_edge_pos = s->v_edge_pos >> field_based;
@@ -1127,7 +1127,7 @@ if(s->quarter_sample)
mx >>= 1;
my >>= 1;
}
-
+
src_x = s->mb_x * 8 + mx;
src_y = s->mb_y * (8 >> field_based) + my;
src_x = clip(src_x, -8, s->width >> 1);
@@ -1181,7 +1181,7 @@ static inline void qpel_motion(MpegEncContext *s,
ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset;
dest_y += dest_offset;
//printf("%d %d %d\n", src_x, src_y, dxy);
-
+
if(s->flags&CODEC_FLAG_EMU_EDGE){
if(src_x<0 || src_y<0 || src_x + (motion_x&3) + 16 > s->h_edge_pos
|| src_y + (motion_y&3) + h > v_edge_pos){
@@ -1233,7 +1233,7 @@ static inline void qpel_motion(MpegEncContext *s,
ptr= s->edge_emu_buffer;
}
pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
-
+
ptr = ref_picture[2] + offset;
if(emu){
emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->h_edge_pos>>1, v_edge_pos>>1);
@@ -1243,9 +1243,9 @@ static inline void qpel_motion(MpegEncContext *s,
}
-static inline void MPV_motion(MpegEncContext *s,
+static inline void MPV_motion(MpegEncContext *s,
UINT8 *dest_y, UINT8 *dest_cb, UINT8 *dest_cr,
- int dir, UINT8 **ref_picture,
+ int dir, UINT8 **ref_picture,
op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16])
{
int dxy, offset, mx, my, src_x, src_y, motion_x, motion_y;
@@ -1272,7 +1272,7 @@ static inline void MPV_motion(MpegEncContext *s,
ref_picture, 0,
0, pix_op,
s->mv[dir][0][0], s->mv[dir][0][1], 16);
- }
+ }
break;
case MV_TYPE_8X8:
mx = 0;
@@ -1285,7 +1285,7 @@ static inline void MPV_motion(MpegEncContext *s,
dxy = ((motion_y & 3) << 2) | (motion_x & 3);
src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8;
-
+
/* WARNING: do no forget half pels */
src_x = clip(src_x, -16, s->width);
if (src_x == s->width)
@@ -1293,7 +1293,7 @@ static inline void MPV_motion(MpegEncContext *s,
src_y = clip(src_y, -16, s->height);
if (src_y == s->height)
dxy &= ~12;
-
+
ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
if(s->flags&CODEC_FLAG_EMU_EDGE){
if(src_x<0 || src_y<0 || src_x + (motion_x&3) + 8 > s->h_edge_pos
@@ -1316,7 +1316,7 @@ static inline void MPV_motion(MpegEncContext *s,
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
src_x = mb_x * 16 + (motion_x >> 1) + (i & 1) * 8;
src_y = mb_y * 16 + (motion_y >> 1) + (i >>1) * 8;
-
+
/* WARNING: do no forget half pels */
src_x = clip(src_x, -16, s->width);
if (src_x == s->width)
@@ -1324,7 +1324,7 @@ static inline void MPV_motion(MpegEncContext *s,
src_y = clip(src_y, -16, s->height);
if (src_y == s->height)
dxy &= ~2;
-
+
ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
if(s->flags&CODEC_FLAG_EMU_EDGE){
if(src_x<0 || src_y<0 || src_x + (motion_x&1) + 8 > s->h_edge_pos
@@ -1370,7 +1370,7 @@ static inline void MPV_motion(MpegEncContext *s,
src_y = clip(src_y, -8, s->height/2);
if (src_y == s->height/2)
dxy &= ~2;
-
+
offset = (src_y * (s->uvlinesize)) + src_x;
ptr = ref_picture[1] + offset;
if(s->flags&CODEC_FLAG_EMU_EDGE){
@@ -1404,7 +1404,7 @@ static inline void MPV_motion(MpegEncContext *s,
1, pix_op, qpix_op,
s->mv[dir][1][0], s->mv[dir][1][1], 8);
}else{
- /* top field */
+ /* top field */
mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
ref_picture, s->field_select[dir][0] ? s->linesize : 0,
1, pix_op,
@@ -1416,7 +1416,7 @@ static inline void MPV_motion(MpegEncContext *s,
s->mv[dir][1][0], s->mv[dir][1][1], 8);
}
} else {
-
+
}
break;
@@ -1425,7 +1425,7 @@ static inline void MPV_motion(MpegEncContext *s,
/* put block[] to dest[] */
-static inline void put_dct(MpegEncContext *s,
+static inline void put_dct(MpegEncContext *s,
DCTELEM *block, int i, UINT8 *dest, int line_size)
{
if (!s->mpeg2)
@@ -1434,7 +1434,7 @@ static inline void put_dct(MpegEncContext *s,
}
/* add block[] to dest[] */
-static inline void add_dct(MpegEncContext *s,
+static inline void add_dct(MpegEncContext *s,
DCTELEM *block, int i, UINT8 *dest, int line_size)
{
if (s->block_last_index[i] >= 0) {
@@ -1442,7 +1442,7 @@ static inline void add_dct(MpegEncContext *s,
}
}
-static inline void add_dequant_dct(MpegEncContext *s,
+static inline void add_dequant_dct(MpegEncContext *s,
DCTELEM *block, int i, UINT8 *dest, int line_size)
{
if (s->block_last_index[i] >= 0) {
@@ -1459,9 +1459,9 @@ void ff_clean_intra_table_entries(MpegEncContext *s)
{
int wrap = s->block_wrap[0];
int xy = s->block_index[0];
-
- s->dc_val[0][xy ] =
- s->dc_val[0][xy + 1 ] =
+
+ s->dc_val[0][xy ] =
+ s->dc_val[0][xy + 1 ] =
s->dc_val[0][xy + wrap] =
s->dc_val[0][xy + 1 + wrap] = 1024;
/* ac pred */
@@ -1481,7 +1481,7 @@ void ff_clean_intra_table_entries(MpegEncContext *s)
/* ac pred */
memset(s->ac_val[1][xy], 0, 16 * sizeof(INT16));
memset(s->ac_val[2][xy], 0, 16 * sizeof(INT16));
-
+
s->mbintra_table[s->mb_x + s->mb_y*s->mb_width]= 0;
}
@@ -1529,7 +1529,7 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
/* update motion predictor, not for B-frames as they need the motion_val from the last P/S-Frame */
if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) { //FIXME move into h263.c if possible, format specific stuff shouldnt be here
-
+
const int wrap = s->block_wrap[0];
const int xy = s->block_index[0];
const int mb_index= s->mb_x + s->mb_y*s->mb_width;
@@ -1570,14 +1570,14 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
s->motion_val[xy + 1 + wrap][1] = motion_y;
}
}
-
+
if (!(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) {
UINT8 *dest_y, *dest_cb, *dest_cr;
int dct_linesize, dct_offset;
op_pixels_func (*op_pix)[4];
qpel_mc_func (*op_qpix)[16];
- /* avoid copy if macroblock skipped in last frame too
+ /* avoid copy if macroblock skipped in last frame too
dont touch it for B-frames as they need the skip info from the next p-frame */
if (s->pict_type != B_TYPE) {
UINT8 *mbskip_ptr = &s->mbskip_table[mb_xy];
@@ -1587,9 +1587,9 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
(*mbskip_ptr) ++; /* indicate that this time we skiped it */
if(*mbskip_ptr >99) *mbskip_ptr= 99;
- /* if previous was skipped too, then nothing to do !
+ /* if previous was skipped too, then nothing to do !
skip only during decoding as we might trash the buffers during encoding a bit */
- if (*mbskip_ptr >= s->ip_buffer_count && !s->encoding)
+ if (*mbskip_ptr >= s->ip_buffer_count && !s->encoding)
goto the_end;
} else {
*mbskip_ptr = 0; /* not skipped */
@@ -1612,7 +1612,7 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
/* motion handling */
/* decoding or more than one mb_type (MC was allready done otherwise) */
if((!s->encoding) || (s->mb_type[mb_xy]&(s->mb_type[mb_xy]-1))){
- if ((!s->no_rounding) || s->pict_type==B_TYPE){
+ if ((!s->no_rounding) || s->pict_type==B_TYPE){
op_pix = put_pixels_tab;
op_qpix= put_qpel_pixels_tab;
}else{
@@ -1726,11 +1726,11 @@ static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index
int i;
const int maxlevel= s->max_qcoeff;
const int minlevel= s->min_qcoeff;
-
+
for(i=0;i<=last_index; i++){
const int j = zigzag_direct[i];
int level = block[j];
-
+
if (level>maxlevel) level=maxlevel;
else if(level<minlevel) level=minlevel;
block[j]= level;
@@ -1833,7 +1833,7 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
diff_pixels(s->block[1], ptr_y + 8, dest_y + 8, wrap_y);
diff_pixels(s->block[2], ptr_y + 8 * wrap_y , dest_y + 8 * wrap_y , wrap_y);
diff_pixels(s->block[3], ptr_y + 8 * wrap_y + 8, dest_y + 8 * wrap_y + 8, wrap_y);
-
+
if(s->flags&CODEC_FLAG_GRAY){
skip_dct[4]= 1;
skip_dct[5]= 1;
@@ -1850,7 +1850,7 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c);
}
- /* pre quantization */
+ /* pre quantization */
if(s->mc_mb_var[s->mb_width*mb_y+ mb_x]<2*s->qscale*s->qscale){
if(pix_abs8x8(ptr_y , dest_y , wrap_y) < 20*s->qscale) skip_dct[0]= 1;
if(pix_abs8x8(ptr_y + 8, dest_y + 8, wrap_y) < 20*s->qscale) skip_dct[1]= 1;
@@ -1865,7 +1865,7 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
for(i=0; i<6; i++)
if(skip_dct[i]) num++;
stat[num]++;
-
+
if(s->mb_x==0 && s->mb_y==0){
for(i=0; i<7; i++){
printf("%6d %1d\n", stat[i], i);
@@ -1876,16 +1876,16 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
}
}
-
+
#if 0
{
float adap_parm;
-
+
adap_parm = ((s->avg_mb_var << 1) + s->mb_var[s->mb_width*mb_y+mb_x] + 1.0) /
((s->mb_var[s->mb_width*mb_y+mb_x] << 1) + s->avg_mb_var + 1.0);
-
- printf("\ntype=%c qscale=%2d adap=%0.2f dquant=%4.2f var=%4d avgvar=%4d",
- (s->mb_type[s->mb_width*mb_y+mb_x] > 0) ? 'I' : 'P',
+
+ printf("\ntype=%c qscale=%2d adap=%0.2f dquant=%4.2f var=%4d avgvar=%4d",
+ (s->mb_type[s->mb_width*mb_y+mb_x] > 0) ? 'I' : 'P',
s->qscale, adap_parm, s->qscale*adap_parm,
s->mb_var[s->mb_width*mb_y+mb_x], s->avg_mb_var);
}
@@ -1964,7 +1964,7 @@ static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext
d->mb_incr= s->mb_incr;
for(i=0; i<3; i++)
d->last_dc[i]= s->last_dc[i];
-
+
/* statistics */
d->mv_bits= s->mv_bits;
d->i_tex_bits= s->i_tex_bits;
@@ -1982,14 +1982,14 @@ static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext
static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){
int i;
- memcpy(d->mv, s->mv, 2*4*2*sizeof(int));
+ memcpy(d->mv, s->mv, 2*4*2*sizeof(int));
memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop?
-
+
/* mpeg1 */
d->mb_incr= s->mb_incr;
for(i=0; i<3; i++)
d->last_dc[i]= s->last_dc[i];
-
+
/* statistics */
d->mv_bits= s->mv_bits;
d->i_tex_bits= s->i_tex_bits;
@@ -2014,12 +2014,12 @@ static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *
d->block_last_index[i]= s->block_last_index[i];
}
-static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type,
+static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type,
PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2],
int *dmin, int *next_block, int motion_x, int motion_y)
{
int bits_count;
-
+
copy_context_before_encode(s, backup, type);
s->block= s->blocks[*next_block];
@@ -2070,14 +2070,14 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->block_wrap[3]= s->mb_width*2 + 2;
s->block_wrap[4]=
s->block_wrap[5]= s->mb_width + 2;
-
+
/* Reset the average MB variance */
s->mb_var_sum = 0;
s->mc_mb_var_sum = 0;
/* we need to initialize some time vars before we can encode b-frames */
if (s->h263_pred && !s->h263_msmpeg4)
- ff_set_mpeg4_time(s, s->picture_number);
+ ff_set_mpeg4_time(s, s->picture_number);
s->scene_change_score=0;
@@ -2111,7 +2111,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
memset(s->motion_val[0], 0, sizeof(INT16)*(s->mb_width*2 + 2)*(s->mb_height*2 + 2)*2);
memset(s->p_mv_table , 0, sizeof(INT16)*(s->mb_width+2)*(s->mb_height+2)*2);
memset(s->mb_type , MB_TYPE_INTRA, sizeof(UINT8)*s->mb_width*s->mb_height);
-
+
if(!s->fixed_qscale){
/* finding spatial complexity for I-frame rate control */
for(mb_y=0; mb_y < s->mb_height; mb_y++) {
@@ -2121,7 +2121,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
uint8_t *pix = s->new_picture[0] + (yy * s->linesize) + xx;
int varc;
int sum = pix_sum(pix, s->linesize);
-
+
sum= (sum+8)>>4;
varc = (pix_norm1(pix, s->linesize) - sum*sum + 500 + 128)>>8;
@@ -2140,8 +2140,8 @@ static void encode_picture(MpegEncContext *s, int picture_number)
}
//printf("Scene change detected, encoding as I Frame %d %d\n", s->mb_var_sum, s->mc_mb_var_sum);
}
-
- if(s->pict_type==P_TYPE || s->pict_type==S_TYPE)
+
+ if(s->pict_type==P_TYPE || s->pict_type==S_TYPE)
s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER);
ff_fix_long_p_mvs(s);
if(s->pict_type==B_TYPE){
@@ -2153,11 +2153,11 @@ static void encode_picture(MpegEncContext *s, int picture_number)
ff_fix_long_b_mvs(s, s->b_bidir_forw_mv_table, s->f_code, MB_TYPE_BIDIR);
ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR);
}
-
+
//printf("f_code %d ///\n", s->f_code);
// printf("%d %d\n", s->avg_mb_var, s->mc_mb_var);
- if (!s->fixed_qscale)
+ if (!s->fixed_qscale)
s->qscale = ff_rate_estimate_qscale(s);
if (s->out_format == FMT_MJPEG) {
@@ -2165,7 +2165,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
for(i=1;i<64;i++)
s->intra_matrix[i] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
- convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16,
+ convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16,
s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias);
}
@@ -2175,11 +2175,11 @@ static void encode_picture(MpegEncContext *s, int picture_number)
mjpeg_picture_header(s);
break;
case FMT_H263:
- if (s->h263_msmpeg4)
+ if (s->h263_msmpeg4)
msmpeg4_encode_picture_header(s, picture_number);
else if (s->h263_pred)
mpeg4_encode_picture_header(s, picture_number);
- else if (s->h263_rv10)
+ else if (s->h263_rv10)
rv10_encode_picture_header(s, picture_number);
else
h263_encode_picture_header(s, picture_number);
@@ -2239,7 +2239,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
if (last_gob) {
s->first_slice_line = 1;
}else{
- /*MN: we reset it here instead at the end of each line cuz mpeg4 can have
+ /*MN: we reset it here instead at the end of each line cuz mpeg4 can have
slice lines starting & ending in the middle*/
s->first_slice_line = 0;
}
@@ -2248,7 +2248,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
-
+
s->block_index[0]= s->block_wrap[0]*(mb_y*2 + 1) - 1;
s->block_index[1]= s->block_wrap[0]*(mb_y*2 + 1);
s->block_index[2]= s->block_wrap[0]*(mb_y*2 + 2) - 1;
@@ -2269,13 +2269,13 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->block_index[3]+=2;
s->block_index[4]++;
s->block_index[5]++;
-
+
/* write gob / video packet header for formats which support it at any MB (MPEG4) */
if(s->rtp_mode && s->mb_y>0 && s->codec_id==CODEC_ID_MPEG4){
int pdif= pbBufPtr(&s->pb) - s->ptr_lastgob;
//the *2 is there so we stay below the requested size
- if(pdif + s->mb_line_avgsize/s->mb_width >= s->rtp_payload_size){
+ if(pdif + s->mb_line_avgsize/s->mb_width >= s->rtp_payload_size){
if(s->codec_id==CODEC_ID_MPEG4){
if(s->data_partitioning && s->pict_type!=B_TYPE){
ff_mpeg4_merge_partitions(s);
@@ -2298,7 +2298,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
if( (s->resync_mb_x == s->mb_x)
&& s->resync_mb_y+1 == s->mb_y){
- s->first_slice_line=0;
+ s->first_slice_line=0;
}
}
@@ -2320,10 +2320,10 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mb_intra= 0;
s->mv[0][0][0] = s->p_mv_table[xy][0];
s->mv[0][0][1] = s->p_mv_table[xy][1];
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER, pb, pb2, tex_pb,
&dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]);
}
- if(mb_type&MB_TYPE_INTER4V){
+ if(mb_type&MB_TYPE_INTER4V){
s->mv_dir = MV_DIR_FORWARD;
s->mv_type = MV_TYPE_8X8;
s->mb_intra= 0;
@@ -2331,7 +2331,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mv[0][i][0] = s->motion_val[s->block_index[i]][0];
s->mv[0][i][1] = s->motion_val[s->block_index[i]][1];
}
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER4V, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER4V, pb, pb2, tex_pb,
&dmin, &next_block, 0, 0);
}
if(mb_type&MB_TYPE_FORWARD){
@@ -2340,7 +2340,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mb_intra= 0;
s->mv[0][0][0] = s->b_forw_mv_table[xy][0];
s->mv[0][0][1] = s->b_forw_mv_table[xy][1];
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_FORWARD, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_FORWARD, pb, pb2, tex_pb,
&dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]);
}
if(mb_type&MB_TYPE_BACKWARD){
@@ -2349,7 +2349,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mb_intra= 0;
s->mv[1][0][0] = s->b_back_mv_table[xy][0];
s->mv[1][0][1] = s->b_back_mv_table[xy][1];
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BACKWARD, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BACKWARD, pb, pb2, tex_pb,
&dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]);
}
if(mb_type&MB_TYPE_BIDIR){
@@ -2360,7 +2360,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1];
s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0];
s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1];
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BIDIR, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BIDIR, pb, pb2, tex_pb,
&dmin, &next_block, 0, 0);
}
if(mb_type&MB_TYPE_DIRECT){
@@ -2371,7 +2371,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mv[0][0][1] = s->b_direct_forw_mv_table[xy][1];
s->mv[1][0][0] = s->b_direct_back_mv_table[xy][0];
s->mv[1][0][1] = s->b_direct_back_mv_table[xy][1];
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_DIRECT, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_DIRECT, pb, pb2, tex_pb,
&dmin, &next_block, s->b_direct_mv_table[xy][0], s->b_direct_mv_table[xy][1]);
}
if(mb_type&MB_TYPE_INTRA){
@@ -2380,25 +2380,25 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->mb_intra= 1;
s->mv[0][0][0] = 0;
s->mv[0][0][1] = 0;
- encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTRA, pb, pb2, tex_pb,
+ encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTRA, pb, pb2, tex_pb,
&dmin, &next_block, 0, 0);
/* force cleaning of ac/dc pred stuff if needed ... */
if(s->h263_pred || s->h263_aic)
s->mbintra_table[mb_x + mb_y*s->mb_width]=1;
}
copy_context_after_encode(s, &best_s, -1);
-
+
pb_bits_count= get_bit_count(&s->pb);
flush_put_bits(&s->pb);
ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count);
s->pb= backup_s.pb;
-
+
if(s->data_partitioning){
pb2_bits_count= get_bit_count(&s->pb2);
flush_put_bits(&s->pb2);
ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count);
s->pb2= backup_s.pb2;
-
+
tex_pb_bits_count= get_bit_count(&s->tex_pb);
flush_put_bits(&s->tex_pb);
ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count);
@@ -2486,11 +2486,11 @@ static void encode_picture(MpegEncContext *s, int picture_number)
if (s->rtp_mode) {
if (!mb_y)
s->mb_line_avgsize = pbBufPtr(&s->pb) - s->ptr_last_mb_line;
- else if (!(mb_y % s->gob_index)) {
+ else if (!(mb_y % s->gob_index)) {
s->mb_line_avgsize = (s->mb_line_avgsize + pbBufPtr(&s->pb) - s->ptr_last_mb_line) >> 1;
s->ptr_last_mb_line = pbBufPtr(&s->pb);
}
- //fprintf(stderr, "\nMB line: %d\tSize: %u\tAvg. Size: %u", s->mb_y,
+ //fprintf(stderr, "\nMB line: %d\tSize: %u\tAvg. Size: %u", s->mb_y,
// (s->pb.buf_ptr - s->ptr_last_mb_line), s->mb_line_avgsize);
if(s->codec_id!=CODEC_ID_MPEG4) s->first_slice_line = 0; //FIXME clean
}
@@ -2503,13 +2503,13 @@ static void encode_picture(MpegEncContext *s, int picture_number)
if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE)
msmpeg4_encode_ext_header(s);
- if(s->codec_id==CODEC_ID_MPEG4)
+ if(s->codec_id==CODEC_ID_MPEG4)
ff_mpeg4_stuffing(&s->pb);
//if (s->gob_number)
// fprintf(stderr,"\nNumber of GOB: %d", s->gob_number);
-
- /* Send the last GOB if RTP */
+
+ /* Send the last GOB if RTP */
if (s->rtp_mode) {
flush_put_bits(&s->pb);
pdif = pbBufPtr(&s->pb) - s->ptr_lastgob;
@@ -2521,7 +2521,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
}
}
-static int dct_quantize_c(MpegEncContext *s,
+static int dct_quantize_c(MpegEncContext *s,
DCTELEM *block, int n,
int qscale, int *overflow)
{
@@ -2530,7 +2530,7 @@ static int dct_quantize_c(MpegEncContext *s,
int bias;
int max=0;
unsigned int threshold1, threshold2;
-
+
s->fdct (block);
/* we need this permutation so that we correct the IDCT
@@ -2547,7 +2547,7 @@ static int dct_quantize_c(MpegEncContext *s,
} else
/* For AIC we skip quant/dequant of INTRADC */
q = 1 << 3;
-
+
/* note: block[0] is assumed to be positive */
block[0] = (block[0] + (q >> 1)) / q;
i = 1;
@@ -2585,11 +2585,11 @@ static int dct_quantize_c(MpegEncContext *s,
}
}
*overflow= s->max_qcoeff < max; //overflow might have happend
-
+
return last_non_zero;
}
-static void dct_unquantize_mpeg1_c(MpegEncContext *s,
+static void dct_unquantize_mpeg1_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
{
int i, level, nCoeffs;
@@ -2597,9 +2597,9 @@ static void dct_unquantize_mpeg1_c(MpegEncContext *s,
if(s->alternate_scan) nCoeffs= 64;
else nCoeffs= s->block_last_index[n]+1;
-
+
if (s->mb_intra) {
- if (n < 4)
+ if (n < 4)
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
@@ -2653,7 +2653,7 @@ static void dct_unquantize_mpeg1_c(MpegEncContext *s,
}
}
-static void dct_unquantize_mpeg2_c(MpegEncContext *s,
+static void dct_unquantize_mpeg2_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
{
int i, level, nCoeffs;
@@ -2661,9 +2661,9 @@ static void dct_unquantize_mpeg2_c(MpegEncContext *s,
if(s->alternate_scan) nCoeffs= 64;
else nCoeffs= s->block_last_index[n]+1;
-
+
if (s->mb_intra) {
- if (n < 4)
+ if (n < 4)
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
@@ -2716,21 +2716,21 @@ static void dct_unquantize_mpeg2_c(MpegEncContext *s,
}
-static void dct_unquantize_h263_c(MpegEncContext *s,
+static void dct_unquantize_h263_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
{
int i, level, qmul, qadd;
int nCoeffs;
-
+
if (s->mb_intra) {
if (!s->h263_aic) {
- if (n < 4)
+ if (n < 4)
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
}
i = 1;
- nCoeffs= 64; //does not allways use zigzag table
+ nCoeffs= 64; //does not allways use zigzag table
} else {
i = 0;
nCoeffs= zigzag_end[ s->block_last_index[n] ];
@@ -2812,7 +2812,7 @@ void ff_conceal_past_errors(MpegEncContext *s, int unknown_pos)
if(s->mbintra_table[i]) intra_count++;
else inter_count++;
}
-
+
if(s->decoding_error==DECODING_AC_LOST){
intra_conceal*=2;
inter_conceal*=2;
@@ -2822,7 +2822,7 @@ void ff_conceal_past_errors(MpegEncContext *s, int unknown_pos)
}
if(unknown_pos && (intra_count<inter_count)){
- intra_conceal= inter_conceal= s->mb_num;
+ intra_conceal= inter_conceal= s->mb_num;
// printf("%d %d\n",intra_count, inter_count);
}
@@ -2843,7 +2843,7 @@ void ff_conceal_past_errors(MpegEncContext *s, int unknown_pos)
remove_ac(s, dest_y, dest_cb, dest_cr, mb_x, mb_y);
// printf("remove ac to %d %d\n", mb_x, mb_y);
}else{
- mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
+ mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
s->last_picture, 0, 0, put_pixels_tab,
0/*mx*/, 0/*my*/, 16);
}
@@ -2858,7 +2858,7 @@ void ff_conceal_past_errors(MpegEncContext *s, int unknown_pos)
my= s->motion_val[ xy ][1];
}
- mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
+ mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
s->last_picture, 0, 0, put_pixels_tab,
mx, my, 16);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 22:41:09 +0000