Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

h263: Add ff_ prefix to nonstatic symbols

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
pull/3/merge
Martin Storsjö 13 years ago
parent 167f3b8de7
commit ddce8953a5
18 changed files with 158 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/h263.c
  2. 36
      libavcodec/h263.h
  3. 24
      libavcodec/h263data.h
  4. 4
      libavcodec/h263dec.c
  5. 4
      libavcodec/intelh263dec.c
  6. 78
      libavcodec/ituh263dec.c
  7. 40
      libavcodec/ituh263enc.c
  8. 50
      libavcodec/mpeg4videodec.c
  9. 6
      libavcodec/mpeg4videoenc.c
  10. 10
      libavcodec/mpegvideo_enc.c
  11. 16
      libavcodec/msmpeg4.c
  12. 12
      libavcodec/msmpeg4data.c
  13. 2
      libavcodec/rv10.c
  14. 2
      libavcodec/rv34data.h
  15. 2
      libavcodec/snowenc.c
  16. 6
      libavcodec/svq1dec.c
  17. 4
      libavcodec/svq1enc.c
  18. 2
      libavcodec/wmv2enc.c

6
libavcodec/h263.c
Unescape View File

@ -98,7 +98,7 @@ void ff_h263_update_motion_val(MpegEncContext * s){
} }
} }
int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) int ff_h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr)
{ {
int x, y, wrap, a, c, pred_dc; int x, y, wrap, a, c, pred_dc;
int16_t *dc_val; int16_t *dc_val;
@ -226,7 +226,7 @@ void ff_h263_loop_filter(MpegEncContext * s){
} }
} }
void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n) void ff_h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)
{ {
int x, y, wrap, a, c, pred_dc, scale, i; int x, y, wrap, a, c, pred_dc, scale, i;
int16_t *dc_val, *ac_val, *ac_val1; int16_t *dc_val, *ac_val, *ac_val1;
@ -313,7 +313,7 @@ void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)
ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]]; ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]];
} }
int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir, int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
int *px, int *py) int *px, int *py)
{ {
int wrap; int wrap;

36
libavcodec/h263.h
Unescape View File

@ -38,16 +38,16 @@
extern const AVRational ff_h263_pixel_aspect[16]; extern const AVRational ff_h263_pixel_aspect[16];
extern const uint8_t ff_h263_cbpy_tab[16][2]; extern const uint8_t ff_h263_cbpy_tab[16][2];
extern const uint8_t cbpc_b_tab[4][2]; extern const uint8_t ff_cbpc_b_tab[4][2];
extern const uint8_t mvtab[33][2]; extern const uint8_t ff_mvtab[33][2];
extern const uint8_t ff_h263_intra_MCBPC_code[9]; extern const uint8_t ff_h263_intra_MCBPC_code[9];
extern const uint8_t ff_h263_intra_MCBPC_bits[9]; extern const uint8_t ff_h263_intra_MCBPC_bits[9];
extern const uint8_t ff_h263_inter_MCBPC_code[28]; extern const uint8_t ff_h263_inter_MCBPC_code[28];
extern const uint8_t ff_h263_inter_MCBPC_bits[28]; extern const uint8_t ff_h263_inter_MCBPC_bits[28];
extern const uint8_t h263_mbtype_b_tab[15][2]; extern const uint8_t ff_h263_mbtype_b_tab[15][2];
extern VLC ff_h263_intra_MCBPC_vlc; extern VLC ff_h263_intra_MCBPC_vlc;
extern VLC ff_h263_inter_MCBPC_vlc; extern VLC ff_h263_inter_MCBPC_vlc;
@ -55,41 +55,41 @@ extern VLC ff_h263_cbpy_vlc;
extern RLTable ff_h263_rl_inter; extern RLTable ff_h263_rl_inter;
extern RLTable rl_intra_aic; extern RLTable ff_rl_intra_aic;
extern const uint16_t h263_format[8][2]; extern const uint16_t ff_h263_format[8][2];
extern const uint8_t modified_quant_tab[2][32]; extern const uint8_t ff_modified_quant_tab[2][32];
extern uint16_t ff_mba_max[6]; extern uint16_t ff_mba_max[6];
extern uint8_t ff_mba_length[7]; extern uint8_t ff_mba_length[7];
extern uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; extern uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
int h263_decode_motion(MpegEncContext * s, int pred, int f_code); int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code);
av_const int ff_h263_aspect_to_info(AVRational aspect); av_const int ff_h263_aspect_to_info(AVRational aspect);
int ff_h263_decode_init(AVCodecContext *avctx); int ff_h263_decode_init(AVCodecContext *avctx);
int ff_h263_decode_frame(AVCodecContext *avctx, int ff_h263_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
AVPacket *avpkt); AVPacket *avpkt);
int ff_h263_decode_end(AVCodecContext *avctx); int ff_h263_decode_end(AVCodecContext *avctx);
void h263_encode_mb(MpegEncContext *s, void ff_h263_encode_mb(MpegEncContext *s,
DCTELEM block[6][64], DCTELEM block[6][64],
int motion_x, int motion_y); int motion_x, int motion_y);
void h263_encode_picture_header(MpegEncContext *s, int picture_number); void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number);
void h263_encode_gob_header(MpegEncContext * s, int mb_line); void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line);
int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir, int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
int *px, int *py); int *px, int *py);
void h263_encode_init(MpegEncContext *s); void ff_h263_encode_init(MpegEncContext *s);
void h263_decode_init_vlc(MpegEncContext *s); void ff_h263_decode_init_vlc(MpegEncContext *s);
int h263_decode_picture_header(MpegEncContext *s); int ff_h263_decode_picture_header(MpegEncContext *s);
int ff_h263_decode_gob_header(MpegEncContext *s); int ff_h263_decode_gob_header(MpegEncContext *s);
void ff_h263_update_motion_val(MpegEncContext * s); void ff_h263_update_motion_val(MpegEncContext * s);
void ff_h263_loop_filter(MpegEncContext * s); void ff_h263_loop_filter(MpegEncContext * s);
int ff_h263_decode_mba(MpegEncContext *s); int ff_h263_decode_mba(MpegEncContext *s);
void ff_h263_encode_mba(MpegEncContext *s); void ff_h263_encode_mba(MpegEncContext *s);
void ff_init_qscale_tab(MpegEncContext *s); void ff_init_qscale_tab(MpegEncContext *s);
int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr); int ff_h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr);
void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n); void ff_h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n);
/** /**
@ -119,7 +119,7 @@ static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code
int l, bit_size, code; int l, bit_size, code;
if (val == 0) { if (val == 0) {
return mvtab[0][1]; return ff_mvtab[0][1];
} else { } else {
bit_size = f_code - 1; bit_size = f_code - 1;
/* modulo encoding */ /* modulo encoding */
@ -128,7 +128,7 @@ static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code
val--; val--;
code = (val >> bit_size) + 1; code = (val >> bit_size) + 1;
return mvtab[code][1] + 1 + bit_size; return ff_mvtab[code][1] + 1 + bit_size;
} }
} }

24
libavcodec/h263data.h
Unescape View File

@ -57,7 +57,7 @@ const uint8_t ff_h263_inter_MCBPC_bits[28] = {
11, 13, 13, 13,/* inter4Q*/ 11, 13, 13, 13,/* inter4Q*/
}; };
const uint8_t h263_mbtype_b_tab[15][2] = { const uint8_t ff_h263_mbtype_b_tab[15][2] = {
{1, 1}, {1, 1},
{3, 3}, {3, 3},
{1, 5}, {1, 5},
@ -75,7 +75,7 @@ const uint8_t h263_mbtype_b_tab[15][2] = {
{1, 8}, {1, 8},
}; };
const uint8_t cbpc_b_tab[4][2] = { const uint8_t ff_cbpc_b_tab[4][2] = {
{0, 1}, {0, 1},
{2, 2}, {2, 2},
{7, 3}, {7, 3},
@ -88,7 +88,7 @@ const uint8_t ff_h263_cbpy_tab[16][2] =
{2,5}, {3,6}, {5,4}, {10,4}, {4,4}, {8,4}, {6,4}, {3,2} {2,5}, {3,6}, {5,4}, {10,4}, {4,4}, {8,4}, {6,4}, {3,2}
}; };
const uint8_t mvtab[33][2] = const uint8_t ff_mvtab[33][2] =
{ {
{1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7}, {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7},
{11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10}, {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10},
@ -98,7 +98,7 @@ const uint8_t mvtab[33][2] =
}; };
/* third non intra table */ /* third non intra table */
const uint16_t inter_vlc[103][2] = { const uint16_t ff_inter_vlc[103][2] = {
{ 0x2, 2 },{ 0xf, 4 },{ 0x15, 6 },{ 0x17, 7 }, { 0x2, 2 },{ 0xf, 4 },{ 0x15, 6 },{ 0x17, 7 },
{ 0x1f, 8 },{ 0x25, 9 },{ 0x24, 9 },{ 0x21, 10 }, { 0x1f, 8 },{ 0x25, 9 },{ 0x24, 9 },{ 0x21, 10 },
{ 0x20, 10 },{ 0x7, 11 },{ 0x6, 11 },{ 0x20, 11 }, { 0x20, 10 },{ 0x7, 11 },{ 0x6, 11 },{ 0x20, 11 },
@ -127,7 +127,7 @@ const uint16_t inter_vlc[103][2] = {
{ 0x5e, 12 },{ 0x5f, 12 },{ 0x3, 7 }, { 0x5e, 12 },{ 0x5f, 12 },{ 0x3, 7 },
}; };
const int8_t inter_level[102] = { const int8_t ff_inter_level[102] = {
1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 1, 2, 3, 4, 9, 10, 11, 12, 1, 2, 3, 4,
5, 6, 1, 2, 3, 4, 1, 2, 5, 6, 1, 2, 3, 4, 1, 2,
@ -143,7 +143,7 @@ const int8_t inter_level[102] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
}; };
const int8_t inter_run[102] = { const int8_t ff_inter_run[102] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
1, 1, 2, 2, 2, 2, 3, 3, 1, 1, 2, 2, 2, 2, 3, 3,
@ -162,9 +162,9 @@ const int8_t inter_run[102] = {
RLTable ff_h263_rl_inter = { RLTable ff_h263_rl_inter = {
102, 102,
58, 58,
inter_vlc, ff_inter_vlc,
inter_run, ff_inter_run,
inter_level, ff_inter_level,
}; };
static const uint16_t intra_vlc_aic[103][2] = { static const uint16_t intra_vlc_aic[103][2] = {
@ -228,7 +228,7 @@ static const int8_t intra_level_aic[102] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
}; };
RLTable rl_intra_aic = { RLTable ff_rl_intra_aic = {
102, 102,
58, 58,
intra_vlc_aic, intra_vlc_aic,
@ -236,7 +236,7 @@ RLTable rl_intra_aic = {
intra_level_aic, intra_level_aic,
}; };
const uint16_t h263_format[8][2] = { const uint16_t ff_h263_format[8][2] = {
{ 0, 0 }, { 0, 0 },
{ 128, 96 }, { 128, 96 },
{ 176, 144 }, { 176, 144 },
@ -250,7 +250,7 @@ const uint8_t ff_aic_dc_scale_table[32]={
0, 2, 4, 6, 8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62 0, 2, 4, 6, 8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62
}; };
const uint8_t modified_quant_tab[2][32]={ const uint8_t ff_modified_quant_tab[2][32]={
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
{ {
0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9,10,11,12,13,14,15,16,17,18,18,19,20,21,22,23,24,25,26,27,28 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9,10,11,12,13,14,15,16,17,18,18,19,20,21,22,23,24,25,26,27,28

4
libavcodec/h263dec.c
Unescape View File

@ -113,7 +113,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
if (MPV_common_init(s) < 0) if (MPV_common_init(s) < 0)
return -1; return -1;
h263_decode_init_vlc(s); ff_h263_decode_init_vlc(s);
return 0; return 0;
} }
@ -421,7 +421,7 @@ retry:
} else if (CONFIG_FLV_DECODER && s->h263_flv) { } else if (CONFIG_FLV_DECODER && s->h263_flv) {
ret = ff_flv_decode_picture_header(s); ret = ff_flv_decode_picture_header(s);
} else { } else {
ret = h263_decode_picture_header(s); ret = ff_h263_decode_picture_header(s);
} }
if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size); if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size);

4
libavcodec/intelh263dec.c
Unescape View File

@ -65,8 +65,8 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
s->pb_frame = get_bits1(&s->gb); s->pb_frame = get_bits1(&s->gb);
if (format < 6) { if (format < 6) {
s->width = h263_format[format][0]; s->width = ff_h263_format[format][0];
s->height = h263_format[format][1]; s->height = ff_h263_format[format][1];
s->avctx->sample_aspect_ratio.num = 12; s->avctx->sample_aspect_ratio.num = 12;
s->avctx->sample_aspect_ratio.den = 11; s->avctx->sample_aspect_ratio.den = 11;
} else { } else {

78
libavcodec/ituh263dec.c
Unescape View File

@ -101,7 +101,7 @@ static VLC cbpc_b_vlc;
/* init vlcs */ /* init vlcs */
/* XXX: find a better solution to handle static init */ /* XXX: find a better solution to handle static init */
void h263_decode_init_vlc(MpegEncContext *s) void ff_h263_decode_init_vlc(MpegEncContext *s)
{ {
static int done = 0; static int done = 0;
@ -118,18 +118,18 @@ void h263_decode_init_vlc(MpegEncContext *s)
&ff_h263_cbpy_tab[0][1], 2, 1, &ff_h263_cbpy_tab[0][1], 2, 1,
&ff_h263_cbpy_tab[0][0], 2, 1, 64); &ff_h263_cbpy_tab[0][0], 2, 1, 64);
INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33, INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33,
&mvtab[0][1], 2, 1, &ff_mvtab[0][1], 2, 1,
&mvtab[0][0], 2, 1, 538); &ff_mvtab[0][0], 2, 1, 538);
init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]); init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
init_rl(&rl_intra_aic, ff_h263_static_rl_table_store[1]); init_rl(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
INIT_VLC_RL(ff_h263_rl_inter, 554); INIT_VLC_RL(ff_h263_rl_inter, 554);
INIT_VLC_RL(rl_intra_aic, 554); INIT_VLC_RL(ff_rl_intra_aic, 554);
INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15,
&h263_mbtype_b_tab[0][1], 2, 1, &ff_h263_mbtype_b_tab[0][1], 2, 1,
&h263_mbtype_b_tab[0][0], 2, 1, 80); &ff_h263_mbtype_b_tab[0][0], 2, 1, 80);
INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4,
&cbpc_b_tab[0][1], 2, 1, &ff_cbpc_b_tab[0][1], 2, 1,
&cbpc_b_tab[0][0], 2, 1, 8); &ff_cbpc_b_tab[0][0], 2, 1, 8);
} }
} }
@ -269,7 +269,7 @@ int ff_h263_resync(MpegEncContext *s){
return -1; return -1;
} }
int h263_decode_motion(MpegEncContext * s, int pred, int f_code) int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code)
{ {
int code, val, sign, shift; int code, val, sign, shift;
code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2); code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2);
@ -379,16 +379,16 @@ static void preview_obmc(MpegEncContext *s){
if ((cbpc & 16) == 0) { if ((cbpc & 16) == 0) {
s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
/* 16x16 motion prediction */ /* 16x16 motion prediction */
mot_val= h263_pred_motion(s, 0, 0, &pred_x, &pred_y); mot_val= ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
if (s->umvplus) if (s->umvplus)
mx = h263p_decode_umotion(s, pred_x); mx = h263p_decode_umotion(s, pred_x);
else else
mx = h263_decode_motion(s, pred_x, 1); mx = ff_h263_decode_motion(s, pred_x, 1);
if (s->umvplus) if (s->umvplus)
my = h263p_decode_umotion(s, pred_y); my = h263p_decode_umotion(s, pred_y);
else else
my = h263_decode_motion(s, pred_y, 1); my = ff_h263_decode_motion(s, pred_y, 1);
mot_val[0 ]= mot_val[2 ]= mot_val[0 ]= mot_val[2 ]=
mot_val[0+stride]= mot_val[2+stride]= mx; mot_val[0+stride]= mot_val[2+stride]= mx;
@ -397,16 +397,16 @@ static void preview_obmc(MpegEncContext *s){
} else { } else {
s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
for(i=0;i<4;i++) { for(i=0;i<4;i++) {
mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
if (s->umvplus) if (s->umvplus)
mx = h263p_decode_umotion(s, pred_x); mx = h263p_decode_umotion(s, pred_x);
else else
mx = h263_decode_motion(s, pred_x, 1); mx = ff_h263_decode_motion(s, pred_x, 1);
if (s->umvplus) if (s->umvplus)
my = h263p_decode_umotion(s, pred_y); my = h263p_decode_umotion(s, pred_y);
else else
my = h263_decode_motion(s, pred_y, 1); my = ff_h263_decode_motion(s, pred_y, 1);
if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) if (s->umvplus && (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 */
mot_val[0] = mx; mot_val[0] = mx;
@ -430,7 +430,7 @@ static void h263_decode_dquant(MpegEncContext *s){
if(s->modified_quant){ if(s->modified_quant){
if(get_bits1(&s->gb)) if(get_bits1(&s->gb))
s->qscale= modified_quant_tab[get_bits1(&s->gb)][ s->qscale ]; s->qscale= ff_modified_quant_tab[get_bits1(&s->gb)][ s->qscale ];
else else
s->qscale= get_bits(&s->gb, 5); s->qscale= get_bits(&s->gb, 5);
}else }else
@ -448,7 +448,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
scan_table = s->intra_scantable.permutated; scan_table = s->intra_scantable.permutated;
if (s->h263_aic && s->mb_intra) { if (s->h263_aic && s->mb_intra) {
rl = &rl_intra_aic; rl = &ff_rl_intra_aic;
i = 0; i = 0;
if (s->ac_pred) { if (s->ac_pred) {
if (s->h263_aic_dir) if (s->h263_aic_dir)
@ -537,7 +537,7 @@ retry:
if (i >= 64){ if (i >= 64){
if(s->alt_inter_vlc && rl == &ff_h263_rl_inter && !s->mb_intra){ if(s->alt_inter_vlc && rl == &ff_h263_rl_inter && !s->mb_intra){
//Looks like a hack but no, it's the way it is supposed to work ... //Looks like a hack but no, it's the way it is supposed to work ...
rl = &rl_intra_aic; rl = &ff_rl_intra_aic;
i = 0; i = 0;
s->gb= gb; s->gb= gb;
s->dsp.clear_block(block); s->dsp.clear_block(block);
@ -554,7 +554,7 @@ retry:
} }
not_coded: not_coded:
if (s->mb_intra && s->h263_aic) { if (s->mb_intra && s->h263_aic) {
h263_pred_acdc(s, block, n); ff_h263_pred_acdc(s, block, n);
i = 63; i = 63;
} }
s->block_last_index[n] = i; s->block_last_index[n] = i;
@ -653,11 +653,11 @@ int ff_h263_decode_mb(MpegEncContext *s,
s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
/* 16x16 motion prediction */ /* 16x16 motion prediction */
s->mv_type = MV_TYPE_16X16; s->mv_type = MV_TYPE_16X16;
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
if (s->umvplus) if (s->umvplus)
mx = h263p_decode_umotion(s, pred_x); mx = h263p_decode_umotion(s, pred_x);
else else
mx = h263_decode_motion(s, pred_x, 1); mx = ff_h263_decode_motion(s, pred_x, 1);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
@ -665,7 +665,7 @@ int ff_h263_decode_mb(MpegEncContext *s,
if (s->umvplus) if (s->umvplus)
my = h263p_decode_umotion(s, pred_y); my = h263p_decode_umotion(s, pred_y);
else else
my = h263_decode_motion(s, pred_y, 1); my = ff_h263_decode_motion(s, pred_y, 1);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
@ -678,18 +678,18 @@ int ff_h263_decode_mb(MpegEncContext *s,
s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
s->mv_type = MV_TYPE_8X8; s->mv_type = MV_TYPE_8X8;
for(i=0;i<4;i++) { for(i=0;i<4;i++) {
mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
if (s->umvplus) if (s->umvplus)
mx = h263p_decode_umotion(s, pred_x); mx = h263p_decode_umotion(s, pred_x);
else else
mx = h263_decode_motion(s, pred_x, 1); mx = ff_h263_decode_motion(s, pred_x, 1);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
if (s->umvplus) if (s->umvplus)
my = h263p_decode_umotion(s, pred_y); my = h263p_decode_umotion(s, pred_y);
else else
my = h263_decode_motion(s, pred_y, 1); my = ff_h263_decode_motion(s, pred_y, 1);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
s->mv[0][i][0] = mx; s->mv[0][i][0] = mx;
@ -761,11 +761,11 @@ int ff_h263_decode_mb(MpegEncContext *s,
//FIXME UMV //FIXME UMV
if(USES_LIST(mb_type, 0)){ if(USES_LIST(mb_type, 0)){
int16_t *mot_val= h263_pred_motion(s, 0, 0, &mx, &my); int16_t *mot_val= ff_h263_pred_motion(s, 0, 0, &mx, &my);
s->mv_dir = MV_DIR_FORWARD; s->mv_dir = MV_DIR_FORWARD;
mx = h263_decode_motion(s, mx, 1); mx = ff_h263_decode_motion(s, mx, 1);
my = h263_decode_motion(s, my, 1); my = ff_h263_decode_motion(s, my, 1);
s->mv[0][0][0] = mx; s->mv[0][0][0] = mx;
s->mv[0][0][1] = my; s->mv[0][0][1] = my;
@ -774,11 +774,11 @@ int ff_h263_decode_mb(MpegEncContext *s,
} }
if(USES_LIST(mb_type, 1)){ if(USES_LIST(mb_type, 1)){
int16_t *mot_val= h263_pred_motion(s, 0, 1, &mx, &my); int16_t *mot_val= ff_h263_pred_motion(s, 0, 1, &mx, &my);
s->mv_dir |= MV_DIR_BACKWARD; s->mv_dir |= MV_DIR_BACKWARD;
mx = h263_decode_motion(s, mx, 1); mx = ff_h263_decode_motion(s, mx, 1);
my = h263_decode_motion(s, my, 1); my = ff_h263_decode_motion(s, my, 1);
s->mv[1][0][0] = mx; s->mv[1][0][0] = mx;
s->mv[1][0][1] = my; s->mv[1][0][1] = my;
@ -829,8 +829,8 @@ intra:
} }
while(pb_mv_count--){ while(pb_mv_count--){
h263_decode_motion(s, 0, 1); ff_h263_decode_motion(s, 0, 1);
h263_decode_motion(s, 0, 1); ff_h263_decode_motion(s, 0, 1);
} }
/* decode each block */ /* decode each block */
@ -864,7 +864,7 @@ end:
} }
/* most is hardcoded. should extend to handle all h263 streams */ /* most is hardcoded. should extend to handle all h263 streams */
int h263_decode_picture_header(MpegEncContext *s) int ff_h263_decode_picture_header(MpegEncContext *s)
{ {
int format, width, height, i; int format, width, height, i;
uint32_t startcode; uint32_t startcode;
@ -916,8 +916,8 @@ int h263_decode_picture_header(MpegEncContext *s)
if (format != 7 && format != 6) { if (format != 7 && format != 6) {
s->h263_plus = 0; s->h263_plus = 0;
/* H.263v1 */ /* H.263v1 */
width = h263_format[format][0]; width = ff_h263_format[format][0];
height = h263_format[format][1]; height = ff_h263_format[format][1];
if (!width) if (!width)
return -1; return -1;
@ -1024,8 +1024,8 @@ int h263_decode_picture_header(MpegEncContext *s)
s->avctx->sample_aspect_ratio= ff_h263_pixel_aspect[s->aspect_ratio_info]; s->avctx->sample_aspect_ratio= ff_h263_pixel_aspect[s->aspect_ratio_info];
} }
} else { } else {
width = h263_format[format][0]; width = ff_h263_format[format][0];
height = h263_format[format][1]; height = ff_h263_format[format][1];
s->avctx->sample_aspect_ratio= (AVRational){12,11}; s->avctx->sample_aspect_ratio= (AVRational){12,11};
} }
if ((width == 0) || (height == 0)) if ((width == 0) || (height == 0))

40
libavcodec/ituh263enc.c
Unescape View File

@ -102,7 +102,7 @@ av_const int ff_h263_aspect_to_info(AVRational aspect){
return FF_ASPECT_EXTENDED; return FF_ASPECT_EXTENDED;
} }
void h263_encode_picture_header(MpegEncContext * s, int picture_number) void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number)
{ {
int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref; int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref;
int best_clock_code=1; int best_clock_code=1;
@ -141,7 +141,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 1, 0); /* camera off */ put_bits(&s->pb, 1, 0); /* camera off */
put_bits(&s->pb, 1, 0); /* freeze picture release off */ put_bits(&s->pb, 1, 0); /* freeze picture release off */
format = ff_match_2uint16(h263_format, FF_ARRAY_ELEMS(h263_format), s->width, s->height); format = ff_match_2uint16(ff_h263_format, FF_ARRAY_ELEMS(ff_h263_format), s->width, s->height);
if (!s->h263_plus) { if (!s->h263_plus) {
/* H.263v1 */ /* H.263v1 */
put_bits(&s->pb, 3, format); put_bits(&s->pb, 3, format);
@ -247,7 +247,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
/** /**
* Encode a group of blocks header. * Encode a group of blocks header.
*/ */
void h263_encode_gob_header(MpegEncContext * s, int mb_line) void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line)
{ {
put_bits(&s->pb, 17, 1); /* GBSC */ put_bits(&s->pb, 17, 1); /* GBSC */
@ -333,7 +333,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)
} else { } else {
i = 0; i = 0;
if (s->h263_aic && s->mb_intra) if (s->h263_aic && s->mb_intra)
rl = &rl_intra_aic; rl = &ff_rl_intra_aic;
if(s->alt_inter_vlc && !s->mb_intra){ if(s->alt_inter_vlc && !s->mb_intra){
int aic_vlc_bits=0; int aic_vlc_bits=0;
@ -353,14 +353,14 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)
if(level<0) level= -level; if(level<0) level= -level;
code = get_rl_index(rl, last, run, level); code = get_rl_index(rl, last, run, level);
aic_code = get_rl_index(&rl_intra_aic, last, run, level); aic_code = get_rl_index(&ff_rl_intra_aic, last, run, level);
inter_vlc_bits += rl->table_vlc[code][1]+1; inter_vlc_bits += rl->table_vlc[code][1]+1;
aic_vlc_bits += rl_intra_aic.table_vlc[aic_code][1]+1; aic_vlc_bits += ff_rl_intra_aic.table_vlc[aic_code][1]+1;
if (code == rl->n) { if (code == rl->n) {
inter_vlc_bits += 1+6+8-1; inter_vlc_bits += 1+6+8-1;
} }
if (aic_code == rl_intra_aic.n) { if (aic_code == ff_rl_intra_aic.n) {
aic_vlc_bits += 1+6+8-1; aic_vlc_bits += 1+6+8-1;
wrong_pos += run + 1; wrong_pos += run + 1;
}else }else
@ -370,7 +370,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)
} }
i = 0; i = 0;
if(aic_vlc_bits < inter_vlc_bits && wrong_pos > 63) if(aic_vlc_bits < inter_vlc_bits && wrong_pos > 63)
rl = &rl_intra_aic; rl = &ff_rl_intra_aic;
} }
} }
@ -454,7 +454,7 @@ static void h263p_encode_umotion(MpegEncContext * s, int val)
} }
} }
void h263_encode_mb(MpegEncContext * s, void ff_h263_encode_mb(MpegEncContext * s,
DCTELEM block[6][64], DCTELEM block[6][64],
int motion_x, int motion_y) int motion_x, int motion_y)
{ {
@ -500,7 +500,7 @@ void h263_encode_mb(MpegEncContext * s,
} }
/* motion vectors: 16x16 mode */ /* motion vectors: 16x16 mode */
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
if (!s->umvplus) { if (!s->umvplus) {
ff_h263_encode_motion_vector(s, motion_x - pred_x, ff_h263_encode_motion_vector(s, motion_x - pred_x,
@ -527,7 +527,7 @@ void h263_encode_mb(MpegEncContext * s,
for(i=0; i<4; i++){ for(i=0; i<4; i++){
/* motion vectors: 8x8 mode*/ /* motion vectors: 8x8 mode*/
h263_pred_motion(s, i, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
motion_x = s->current_picture.f.motion_val[0][s->block_index[i]][0]; motion_x = s->current_picture.f.motion_val[0][s->block_index[i]][0];
motion_y = s->current_picture.f.motion_val[0][s->block_index[i]][1]; motion_y = s->current_picture.f.motion_val[0][s->block_index[i]][1];
@ -561,7 +561,7 @@ void h263_encode_mb(MpegEncContext * s,
if(i<4) scale= s->y_dc_scale; if(i<4) scale= s->y_dc_scale;
else scale= s->c_dc_scale; else scale= s->c_dc_scale;
pred_dc = h263_pred_dc(s, i, &dc_ptr[i]); pred_dc = ff_h263_pred_dc(s, i, &dc_ptr[i]);
level -= pred_dc; level -= pred_dc;
/* Quant */ /* Quant */
if (level >= 0) if (level >= 0)
@ -662,7 +662,7 @@ void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code)
if (val == 0) { if (val == 0) {
/* zero vector */ /* zero vector */
code = 0; code = 0;
put_bits(&s->pb, mvtab[code][1], mvtab[code][0]); put_bits(&s->pb, ff_mvtab[code][1], ff_mvtab[code][0]);
} else { } else {
bit_size = f_code - 1; bit_size = f_code - 1;
range = 1 << bit_size; range = 1 << bit_size;
@ -676,7 +676,7 @@ void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code)
code = (val >> bit_size) + 1; code = (val >> bit_size) + 1;
bits = val & (range - 1); bits = val & (range - 1);
put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign); put_bits(&s->pb, ff_mvtab[code][1] + 1, (ff_mvtab[code][0] << 1) | sign);
if (bit_size > 0) { if (bit_size > 0) {
put_bits(&s->pb, bit_size, bits); put_bits(&s->pb, bit_size, bits);
} }
@ -692,7 +692,7 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s)
for(mv=-MAX_MV; mv<=MAX_MV; mv++){ for(mv=-MAX_MV; mv<=MAX_MV; mv++){
int len; int len;
if(mv==0) len= mvtab[0][1]; if(mv==0) len= ff_mvtab[0][1];
else{ else{
int val, bit_size, code; int val, bit_size, code;
@ -704,9 +704,9 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s)
val--; val--;
code = (val >> bit_size) + 1; code = (val >> bit_size) + 1;
if(code<33){ if(code<33){
len= mvtab[code][1] + 1 + bit_size; len= ff_mvtab[code][1] + 1 + bit_size;
}else{ }else{
len= mvtab[32][1] + av_log2(code>>5) + 2 + bit_size; len= ff_mvtab[32][1] + av_log2(code>>5) + 2 + bit_size;
} }
} }
@ -768,7 +768,7 @@ static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_t
} }
} }
void h263_encode_init(MpegEncContext *s) void ff_h263_encode_init(MpegEncContext *s)
{ {
static int done = 0; static int done = 0;
@ -776,9 +776,9 @@ void h263_encode_init(MpegEncContext *s)
done = 1; done = 1;
init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]); init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
init_rl(&rl_intra_aic, ff_h263_static_rl_table_store[1]); init_rl(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
init_uni_h263_rl_tab(&rl_intra_aic, NULL, uni_h263_intra_aic_rl_len); init_uni_h263_rl_tab(&ff_rl_intra_aic, NULL, uni_h263_intra_aic_rl_len);
init_uni_h263_rl_tab(&ff_h263_rl_inter , NULL, uni_h263_inter_rl_len); init_uni_h263_rl_tab(&ff_h263_rl_inter , NULL, uni_h263_inter_rl_len);
init_mv_penalty_and_fcode(s); init_mv_penalty_and_fcode(s);

50
libavcodec/mpeg4videodec.c
Unescape View File

@ -651,13 +651,13 @@ try_again:
if ((cbpc & 16) == 0) { if ((cbpc & 16) == 0) {
/* 16x16 motion prediction */ /* 16x16 motion prediction */
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
if(!s->mcsel){ if(!s->mcsel){
mx = h263_decode_motion(s, pred_x, s->f_code); mx = ff_h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
my = h263_decode_motion(s, pred_y, s->f_code); my = ff_h263_decode_motion(s, pred_y, s->f_code);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
@ -675,12 +675,12 @@ try_again:
int i; int i;
s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
for(i=0;i<4;i++) { for(i=0;i<4;i++) {
int16_t *mot_val= h263_pred_motion(s, i, 0, &pred_x, &pred_y); int16_t *mot_val= ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
mx = h263_decode_motion(s, pred_x, s->f_code); mx = ff_h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
my = h263_decode_motion(s, pred_y, s->f_code); my = ff_h263_decode_motion(s, pred_y, s->f_code);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
mot_val[0] = mx; mot_val[0] = mx;
@ -1223,14 +1223,14 @@ static int mpeg4_decode_mb(MpegEncContext *s,
s->field_select[0][0]= get_bits1(&s->gb); s->field_select[0][0]= get_bits1(&s->gb);
s->field_select[0][1]= get_bits1(&s->gb); s->field_select[0][1]= get_bits1(&s->gb);
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
for(i=0; i<2; i++){ for(i=0; i<2; i++){
mx = h263_decode_motion(s, pred_x, s->f_code); mx = ff_h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
my = h263_decode_motion(s, pred_y/2, s->f_code); my = ff_h263_decode_motion(s, pred_y/2, s->f_code);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
@ -1241,13 +1241,13 @@ static int mpeg4_decode_mb(MpegEncContext *s,
s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
/* 16x16 motion prediction */ /* 16x16 motion prediction */
s->mv_type = MV_TYPE_16X16; s->mv_type = MV_TYPE_16X16;
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
mx = h263_decode_motion(s, pred_x, s->f_code); mx = ff_h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
my = h263_decode_motion(s, pred_y, s->f_code); my = ff_h263_decode_motion(s, pred_y, s->f_code);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
@ -1258,12 +1258,12 @@ static int mpeg4_decode_mb(MpegEncContext *s,
s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0; s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
s->mv_type = MV_TYPE_8X8; s->mv_type = MV_TYPE_8X8;
for(i=0;i<4;i++) { for(i=0;i<4;i++) {
mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
mx = h263_decode_motion(s, pred_x, s->f_code); mx = ff_h263_decode_motion(s, pred_x, s->f_code);
if (mx >= 0xffff) if (mx >= 0xffff)
return -1; return -1;
my = h263_decode_motion(s, pred_y, s->f_code); my = ff_h263_decode_motion(s, pred_y, s->f_code);
if (my >= 0xffff) if (my >= 0xffff)
return -1; return -1;
s->mv[0][i][0] = mx; s->mv[0][i][0] = mx;
@ -1359,8 +1359,8 @@ static int mpeg4_decode_mb(MpegEncContext *s,
if(USES_LIST(mb_type, 0)){ if(USES_LIST(mb_type, 0)){
s->mv_dir = MV_DIR_FORWARD; s->mv_dir = MV_DIR_FORWARD;
mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code); mx = ff_h263_decode_motion(s, s->last_mv[0][0][0], s->f_code);
my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code); my = ff_h263_decode_motion(s, s->last_mv[0][0][1], s->f_code);
s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx; 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; s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
} }
@ -1368,8 +1368,8 @@ static int mpeg4_decode_mb(MpegEncContext *s,
if(USES_LIST(mb_type, 1)){ if(USES_LIST(mb_type, 1)){
s->mv_dir |= MV_DIR_BACKWARD; s->mv_dir |= MV_DIR_BACKWARD;
mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code); mx = ff_h263_decode_motion(s, s->last_mv[1][0][0], s->b_code);
my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code); my = ff_h263_decode_motion(s, s->last_mv[1][0][1], s->b_code);
s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx; s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx;
s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my; s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my;
} }
@ -1380,8 +1380,8 @@ static int mpeg4_decode_mb(MpegEncContext *s,
s->mv_dir = MV_DIR_FORWARD; s->mv_dir = MV_DIR_FORWARD;
for(i=0; i<2; i++){ for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code); mx = ff_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); my = ff_h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code);
s->last_mv[0][i][0]= s->mv[0][i][0] = mx; s->last_mv[0][i][0]= s->mv[0][i][0] = mx;
s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2; s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
} }
@ -1391,8 +1391,8 @@ static int mpeg4_decode_mb(MpegEncContext *s,
s->mv_dir |= MV_DIR_BACKWARD; s->mv_dir |= MV_DIR_BACKWARD;
for(i=0; i<2; i++){ for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code); mx = ff_h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code);
my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code); my = ff_h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code);
s->last_mv[1][i][0]= s->mv[1][i][0] = mx; s->last_mv[1][i][0]= s->mv[1][i][0] = mx;
s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2; s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2;
} }
@ -1404,8 +1404,8 @@ static int mpeg4_decode_mb(MpegEncContext *s,
if(IS_SKIP(mb_type)) if(IS_SKIP(mb_type))
mx=my=0; mx=my=0;
else{ else{
mx = h263_decode_motion(s, 0, 1); mx = ff_h263_decode_motion(s, 0, 1);
my = h263_decode_motion(s, 0, 1); my = ff_h263_decode_motion(s, 0, 1);
} }
s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;

6
libavcodec/mpeg4videoenc.c
Unescape View File

@ -693,7 +693,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
} }
/* motion vectors: 16x16 mode */ /* motion vectors: 16x16 mode */
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
ff_h263_encode_motion_vector(s, motion_x - pred_x, ff_h263_encode_motion_vector(s, motion_x - pred_x,
motion_y - pred_y, s->f_code); motion_y - pred_y, s->f_code);
@ -717,7 +717,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
} }
/* motion vectors: 16x8 interlaced mode */ /* motion vectors: 16x8 interlaced mode */
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
pred_y /=2; pred_y /=2;
put_bits(&s->pb, 1, s->field_select[0][0]); put_bits(&s->pb, 1, s->field_select[0][0]);
@ -745,7 +745,7 @@ void mpeg4_encode_mb(MpegEncContext * s,
for(i=0; i<4; i++){ for(i=0; i<4; i++){
/* motion vectors: 8x8 mode*/ /* motion vectors: 8x8 mode*/
h263_pred_motion(s, i, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
ff_h263_encode_motion_vector(s, s->current_picture.f.motion_val[0][ s->block_index[i] ][0] - pred_x, ff_h263_encode_motion_vector(s, s->current_picture.f.motion_val[0][ s->block_index[i] ][0] - pred_x,
s->current_picture.f.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code); s->current_picture.f.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code);

10
libavcodec/mpegvideo_enc.c
Unescape View File

@ -658,7 +658,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
case CODEC_ID_H263: case CODEC_ID_H263:
if (!CONFIG_H263_ENCODER) if (!CONFIG_H263_ENCODER)
return -1; return -1;
if (ff_match_2uint16(h263_format, FF_ARRAY_ELEMS(h263_format), if (ff_match_2uint16(ff_h263_format, FF_ARRAY_ELEMS(ff_h263_format),
s->width, s->height) == 8) { s->width, s->height) == 8) {
av_log(avctx, AV_LOG_INFO, av_log(avctx, AV_LOG_INFO,
"The specified picture size of %dx%d is not valid for " "The specified picture size of %dx%d is not valid for "
@ -786,7 +786,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) if (CONFIG_H261_ENCODER && s->out_format == FMT_H261)
ff_h261_encode_init(s); ff_h261_encode_init(s);
if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) if (CONFIG_H263_ENCODER && s->out_format == FMT_H263)
h263_encode_init(s); ff_h263_encode_init(s);
if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version)
ff_msmpeg4_encode_init(s); ff_msmpeg4_encode_init(s);
if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
@ -2020,7 +2020,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
case CODEC_ID_RV10: case CODEC_ID_RV10:
case CODEC_ID_RV20: case CODEC_ID_RV20:
if (CONFIG_H263_ENCODER) if (CONFIG_H263_ENCODER)
h263_encode_mb(s, s->block, motion_x, motion_y); ff_h263_encode_mb(s, s->block, motion_x, motion_y);
break; break;
case CODEC_ID_MJPEG: case CODEC_ID_MJPEG:
if (CONFIG_MJPEG_ENCODER) if (CONFIG_MJPEG_ENCODER)
@ -2450,7 +2450,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
case CODEC_ID_H263: case CODEC_ID_H263:
case CODEC_ID_H263P: case CODEC_ID_H263P:
if (CONFIG_H263_ENCODER) if (CONFIG_H263_ENCODER)
h263_encode_gob_header(s, mb_y); ff_h263_encode_gob_header(s, mb_y);
break; break;
} }
@ -3200,7 +3200,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
else if (CONFIG_FLV_ENCODER && s->codec_id == CODEC_ID_FLV1) else if (CONFIG_FLV_ENCODER && s->codec_id == CODEC_ID_FLV1)
ff_flv_encode_picture_header(s, picture_number); ff_flv_encode_picture_header(s, picture_number);
else if (CONFIG_H263_ENCODER) else if (CONFIG_H263_ENCODER)
h263_encode_picture_header(s, picture_number); ff_h263_encode_picture_header(s, picture_number);
break; break;
case FMT_MPEG1: case FMT_MPEG1:
if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)

16
libavcodec/msmpeg4.c
Unescape View File

@ -507,7 +507,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
if (val == 0) { if (val == 0) {
/* zero vector */ /* zero vector */
code = 0; code = 0;
put_bits(&s->pb, mvtab[code][1], mvtab[code][0]); put_bits(&s->pb, ff_mvtab[code][1], ff_mvtab[code][0]);
} else { } else {
bit_size = s->f_code - 1; bit_size = s->f_code - 1;
range = 1 << bit_size; range = 1 << bit_size;
@ -526,7 +526,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
code = (val >> bit_size) + 1; code = (val >> bit_size) + 1;
bits = val & (range - 1); bits = val & (range - 1);
put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign); put_bits(&s->pb, ff_mvtab[code][1] + 1, (ff_mvtab[code][0] << 1) | sign);
if (bit_size > 0) { if (bit_size > 0) {
put_bits(&s->pb, bit_size, bits); put_bits(&s->pb, bit_size, bits);
} }
@ -575,7 +575,7 @@ void msmpeg4_encode_mb(MpegEncContext * s,
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
msmpeg4v2_encode_motion(s, motion_x - pred_x); msmpeg4v2_encode_motion(s, motion_x - pred_x);
msmpeg4v2_encode_motion(s, motion_y - pred_y); msmpeg4v2_encode_motion(s, motion_y - pred_y);
}else{ }else{
@ -586,7 +586,7 @@ void msmpeg4_encode_mb(MpegEncContext * s,
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
/* motion vector */ /* motion vector */
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
ff_msmpeg4_encode_motion(s, motion_x - pred_x, ff_msmpeg4_encode_motion(s, motion_x - pred_x,
motion_y - pred_y); motion_y - pred_y);
} }
@ -1134,7 +1134,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
cbp|= cbpy<<2; cbp|= cbpy<<2;
if(s->msmpeg4_version==1 || (cbp&3) != 3) cbp^= 0x3C; if(s->msmpeg4_version==1 || (cbp&3) != 3) cbp^= 0x3C;
h263_pred_motion(s, 0, 0, &mx, &my); ff_h263_pred_motion(s, 0, 0, &mx, &my);
mx= msmpeg4v2_decode_motion(s, mx, 1); mx= msmpeg4v2_decode_motion(s, mx, 1);
my= msmpeg4v2_decode_motion(s, my, 1); my= msmpeg4v2_decode_motion(s, my, 1);
@ -1220,7 +1220,7 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
s->rl_table_index = decode012(&s->gb); s->rl_table_index = decode012(&s->gb);
s->rl_chroma_table_index = s->rl_table_index; s->rl_chroma_table_index = s->rl_table_index;
} }
h263_pred_motion(s, 0, 0, &mx, &my); ff_h263_pred_motion(s, 0, 0, &mx, &my);
if (ff_msmpeg4_decode_motion(s, &mx, &my) < 0) if (ff_msmpeg4_decode_motion(s, &mx, &my) < 0)
return -1; return -1;
s->mv_dir = MV_DIR_FORWARD; s->mv_dir = MV_DIR_FORWARD;
@ -1316,8 +1316,8 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
&v2_mb_type[0][1], 2, 1, &v2_mb_type[0][1], 2, 1,
&v2_mb_type[0][0], 2, 1, 128); &v2_mb_type[0][0], 2, 1, 128);
INIT_VLC_STATIC(&v2_mv_vlc, V2_MV_VLC_BITS, 33, INIT_VLC_STATIC(&v2_mv_vlc, V2_MV_VLC_BITS, 33,
&mvtab[0][1], 2, 1, &ff_mvtab[0][1], 2, 1,
&mvtab[0][0], 2, 1, 538); &ff_mvtab[0][0], 2, 1, 538);
INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128, INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128,
&wmv2_inter_table[0][0][1], 8, 4, &wmv2_inter_table[0][0][1], 8, 4,

12
libavcodec/msmpeg4data.c
Unescape View File

@ -592,9 +592,9 @@ static const int8_t table4_run[168] = {
29, 30, 31, 32, 33, 34, 35, 36, 29, 30, 31, 32, 33, 34, 35, 36,
}; };
extern const uint16_t inter_vlc[103][2]; extern const uint16_t ff_inter_vlc[103][2];
extern const int8_t inter_level[102]; extern const int8_t ff_inter_level[102];
extern const int8_t inter_run[102]; extern const int8_t ff_inter_run[102];
extern const uint16_t ff_mpeg4_intra_vlc[103][2]; extern const uint16_t ff_mpeg4_intra_vlc[103][2];
extern const int8_t ff_mpeg4_intra_level[102]; extern const int8_t ff_mpeg4_intra_level[102];
@ -647,9 +647,9 @@ RLTable rl_table[NB_RL_TABLES] = {
{ {
102, 102,
58, 58,
inter_vlc, ff_inter_vlc,
inter_run, ff_inter_run,
inter_level, ff_inter_level,
}, },
}; };

2
libavcodec/rv10.c
Unescape View File

@ -471,7 +471,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
if (MPV_common_init(s) < 0) if (MPV_common_init(s) < 0)
return -1; return -1;
h263_decode_init_vlc(s); ff_h263_decode_init_vlc(s);
/* init rv vlc */ /* init rv vlc */
if (!done) { if (!done) {

2
libavcodec/rv34data.h
Unescape View File

@ -101,7 +101,7 @@ static const uint8_t rv34_quant_to_vlc_set[2][31] = {
/** /**
* table for obtaining the quantizer difference * table for obtaining the quantizer difference
* @todo Use with modified_quant_tab from h263data.h. * @todo Use with ff_modified_quant_tab from h263data.h.
*/ */
static const uint8_t rv34_dquant_tab[2][32]={ static const uint8_t rv34_dquant_tab[2][32]={
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31

2
libavcodec/snowenc.c
Unescape View File

@ -199,7 +199,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t)); s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t)); s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t)); s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
h263_encode_init(&s->m); //mv_penalty ff_h263_encode_init(&s->m); //mv_penalty
s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1); s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);

6
libavcodec/svq1dec.c
Unescape View File

@ -43,7 +43,7 @@
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
extern const uint8_t mvtab[33][2]; extern const uint8_t ff_mvtab[33][2];
static VLC svq1_block_type; static VLC svq1_block_type;
static VLC svq1_motion_component; static VLC svq1_motion_component;
@ -769,8 +769,8 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx)
&ff_svq1_block_type_vlc[0][0], 2, 1, 6); &ff_svq1_block_type_vlc[0][0], 2, 1, 6);
INIT_VLC_STATIC(&svq1_motion_component, 7, 33, INIT_VLC_STATIC(&svq1_motion_component, 7, 33,
&mvtab[0][1], 2, 1, &ff_mvtab[0][1], 2, 1,
&mvtab[0][0], 2, 1, 176); &ff_mvtab[0][0], 2, 1, 176);
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
static const uint8_t sizes[2][6] = {{14, 10, 14, 18, 16, 18}, {10, 10, 14, 14, 14, 16}}; static const uint8_t sizes[2][6] = {{14, 10, 14, 18, 16, 18}, {10, 10, 14, 14, 14, 16}};

4
libavcodec/svq1enc.c
Unescape View File

@ -402,7 +402,7 @@ static int svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plane
int mx, my, pred_x, pred_y, dxy; int mx, my, pred_x, pred_y, dxy;
int16_t *motion_ptr; int16_t *motion_ptr;
motion_ptr= h263_pred_motion(&s->m, 0, 0, &pred_x, &pred_y); motion_ptr= ff_h263_pred_motion(&s->m, 0, 0, &pred_x, &pred_y);
if(s->m.mb_type[x + y*s->m.mb_stride]&CANDIDATE_MB_TYPE_INTER){ if(s->m.mb_type[x + y*s->m.mb_stride]&CANDIDATE_MB_TYPE_INTER){
for(i=0; i<6; i++) for(i=0; i<6; i++)
init_put_bits(&s->reorder_pb[i], reorder_buffer[1][i], 7*32); init_put_bits(&s->reorder_pb[i], reorder_buffer[1][i], 7*32);
@ -492,7 +492,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t)); s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
s->mb_type = av_mallocz((s->y_block_width+1)*s->y_block_height*sizeof(int16_t)); s->mb_type = av_mallocz((s->y_block_width+1)*s->y_block_height*sizeof(int16_t));
s->dummy = av_mallocz((s->y_block_width+1)*s->y_block_height*sizeof(int32_t)); s->dummy = av_mallocz((s->y_block_width+1)*s->y_block_height*sizeof(int32_t));
h263_encode_init(&s->m); //mv_penalty ff_h263_encode_init(&s->m); //mv_penalty
return 0; return 0;
} }

2
libavcodec/wmv2enc.c
Unescape View File

@ -171,7 +171,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
wmv2_inter_table[w->cbp_table_index][cbp + 64][0]); wmv2_inter_table[w->cbp_table_index][cbp + 64][0]);
/* motion vector */ /* motion vector */
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
ff_msmpeg4_encode_motion(s, motion_x - pred_x, ff_msmpeg4_encode_motion(s, motion_x - pred_x,
motion_y - pred_y); motion_y - pred_y);
} else { } else {

Write Preview
Loading…
Cancel
Save