Skip to content

F
ffmpeg.wasm-core
Commit 18df75fa authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '8769113a' 

* commit '8769113a':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videoenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3033cd75 8769113a
Show whitespace changes
Inline Side-by-side
Showing with 644 additions and 587 deletions
libavcodec/mpeg4videoenc.c
View file @ 18df75fa
...@@ -27,63 +27,66 @@ ...@@ -27,63 +27,66 @@
#include "h263.h" #include "h263.h"
#include "mpeg4video.h" #include "mpeg4video.h"
//The uni_DCtab_* tables below contain unified bits+length tables to encode DC /* The uni_DCtab_* tables below contain unified bits+length tables to encode DC
//differences in mpeg4. Unified in the sense that the specification specifies * differences in mpeg4. Unified in the sense that the specification specifies
//this encoding in several steps. * this encoding in several steps. */
static uint8_t uni_DCtab_lum_len[512]; static uint8_t uni_DCtab_lum_len[512];
static uint8_t uni_DCtab_chrom_len[512]; static uint8_t uni_DCtab_chrom_len[512];
static uint16_t uni_DCtab_lum_bits[512]; static uint16_t uni_DCtab_lum_bits[512];
static uint16_t uni_DCtab_chrom_bits[512]; static uint16_t uni_DCtab_chrom_bits[512];
//unified encoding tables for run length encoding of coefficients /* Unified encoding tables for run length encoding of coefficients.
//unified in the sense that the specification specifies the encoding in several steps. * Unified in the sense that the specification specifies the encoding in several steps. */
static uint32_t uni_mpeg4_intra_rl_bits[64*64*2*2]; static uint32_t uni_mpeg4_intra_rl_bits[64 * 64 * 2 * 2];
static uint8_t uni_mpeg4_intra_rl_len [64*64*2*2]; static uint8_t uni_mpeg4_intra_rl_len[64 * 64 * 2 * 2];
static uint32_t uni_mpeg4_inter_rl_bits[64*64*2*2]; static uint32_t uni_mpeg4_inter_rl_bits[64 * 64 * 2 * 2];
static uint8_t uni_mpeg4_inter_rl_len [64*64*2*2]; static uint8_t 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)*128 + (level))
/* mpeg4 //#define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 + (run) * 256 + (level))
inter //#define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 * 64 + (run) + (level) * 64)
max level: 24/6 #define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 * 64 + (run) * 128 + (level))
max run: 53/63
intra
max level: 53/16
max run: 29/41
*/
/* mpeg4
* inter
* max level: 24/6
* max run: 53/63
*
* intra
* max level: 53/16
* max run: 29/41
*/
/** /**
* Return the number of bits that encoding the 8x8 block in block would need. * Return the number of bits that encoding the 8x8 block in block would need.
* @param[in] block_last_index last index in scantable order that refers to a non zero element in block. * @param[in] block_last_index last index in scantable order that refers to a non zero element in block.
*/ */
static inline int get_block_rate(MpegEncContext * s, int16_t block[64], int block_last_index, uint8_t scantable[64]){ static inline int get_block_rate(MpegEncContext *s, int16_t block[64],
int last=0; int block_last_index, uint8_t scantable[64])
{
int last = 0;
int j; int j;
int rate=0; int rate = 0;
for(j=1; j<=block_last_index; j++){ for (j = 1; j <= block_last_index; j++) {
const int index= scantable[j]; const int index = scantable[j];
int level= block[index]; int level = block[index];
if(level){ if (level) {
level+= 64; level += 64;
if((level&(~127)) == 0){ if ((level & (~127)) == 0) {
if(j<block_last_index) rate+= s->intra_ac_vlc_length [UNI_AC_ENC_INDEX(j-last-1, level)]; if (j < block_last_index)
else rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)]; rate += s->intra_ac_vlc_length[UNI_AC_ENC_INDEX(j - last - 1, level)];
}else else
rate += s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j - last - 1, level)];
} else
rate += s->ac_esc_length; rate += s->ac_esc_length;
last= j; last = j;
} }
} }
return rate; return rate;
} }
/** /**
* Restore the ac coefficients in block that have been changed by decide_ac_pred(). * Restore the ac coefficients in block that have been changed by decide_ac_pred().
* This function also restores s->block_last_index. * This function also restores s->block_last_index.
...@@ -92,25 +95,25 @@ static inline int get_block_rate(MpegEncContext * s, int16_t block[64], int bloc ...@@ -92,25 +95,25 @@ static inline int get_block_rate(MpegEncContext * s, int16_t block[64], int bloc
* @param[out] st scantable for each 8x8 block * @param[out] st scantable for each 8x8 block
* @param[in] zigzag_last_index index referring to the last non zero coefficient in zigzag order * @param[in] zigzag_last_index index referring to the last non zero coefficient in zigzag order
*/ */
static inline void restore_ac_coeffs(MpegEncContext * s, int16_t block[6][64], const int dir[6], uint8_t *st[6], const int zigzag_last_index[6]) static inline void restore_ac_coeffs(MpegEncContext *s, int16_t block[6][64],
const int dir[6], uint8_t *st[6],
const int zigzag_last_index[6])
{ {
int i, n; int i, n;
memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6); memcpy(s->block_last_index, zigzag_last_index, sizeof(int) * 6);
for(n=0; n<6; n++){ for (n = 0; n < 6; n++) {
int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16; int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
st[n]= s->intra_scantable.permutated; st[n] = s->intra_scantable.permutated;
if(dir[n]){ if (dir[n]) {
/* top prediction */ /* top prediction */
for(i=1; i<8; i++){ for (i = 1; i < 8; i++)
block[n][s->dsp.idct_permutation[i ]] = ac_val[i+8]; block[n][s->dsp.idct_permutation[i]] = ac_val[i + 8];
} } else {
}else{
/* left prediction */ /* left prediction */
for(i=1; i<8; i++){ for (i = 1; i < 8; i++)
block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i ]; block[n][s->dsp.idct_permutation[i << 3]] = ac_val[i];
}
} }
} }
} }
...@@ -123,77 +126,81 @@ static inline void restore_ac_coeffs(MpegEncContext * s, int16_t block[6][64], c ...@@ -123,77 +126,81 @@ static inline void restore_ac_coeffs(MpegEncContext * s, int16_t block[6][64], c
* @param[out] st scantable for each 8x8 block * @param[out] st scantable for each 8x8 block
* @param[out] zigzag_last_index index referring to the last non zero coefficient in zigzag order * @param[out] zigzag_last_index index referring to the last non zero coefficient in zigzag order
*/ */
static inline int decide_ac_pred(MpegEncContext * s, int16_t block[6][64], const int dir[6], uint8_t *st[6], int zigzag_last_index[6]) static inline int decide_ac_pred(MpegEncContext *s, int16_t block[6][64],
const int dir[6], uint8_t *st[6],
int zigzag_last_index[6])
{ {
int score= 0; int score = 0;
int i, n; int i, n;
int8_t * const qscale_table = s->current_picture.qscale_table; int8_t *const qscale_table = s->current_picture.qscale_table;
memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6); memcpy(zigzag_last_index, s->block_last_index, sizeof(int) * 6);
for(n=0; n<6; n++){ for (n = 0; n < 6; n++) {
int16_t *ac_val, *ac_val1; int16_t *ac_val, *ac_val1;
score -= get_block_rate(s, block[n], s->block_last_index[n], s->intra_scantable.permutated); score -= get_block_rate(s, block[n], s->block_last_index[n],
s->intra_scantable.permutated);
ac_val = s->ac_val[0][0] + s->block_index[n] * 16; ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
ac_val1= ac_val; ac_val1 = ac_val;
if(dir[n]){ if (dir[n]) {
const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride; const int xy = s->mb_x + s->mb_y * s->mb_stride - s->mb_stride;
/* top prediction */ /* top prediction */
ac_val-= s->block_wrap[n]*16; ac_val -= s->block_wrap[n] * 16;
if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){ if (s->mb_y == 0 || s->qscale == qscale_table[xy] || n == 2 || n == 3) {
/* same qscale */ /* same qscale */
for(i=1; i<8; i++){ for (i = 1; i < 8; i++) {
const int level= block[n][s->dsp.idct_permutation[i ]]; const int level = block[n][s->dsp.idct_permutation[i]];
block[n][s->dsp.idct_permutation[i ]] = level - ac_val[i+8]; block[n][s->dsp.idct_permutation[i]] = level - ac_val[i + 8];
ac_val1[i ]= block[n][s->dsp.idct_permutation[i<<3]]; ac_val1[i] = block[n][s->dsp.idct_permutation[i << 3]];
ac_val1[i+8]= level; ac_val1[i + 8] = level;
} }
}else{ } else {
/* different qscale, we must rescale */ /* different qscale, we must rescale */
for(i=1; i<8; i++){ for (i = 1; i < 8; i++) {
const int level= block[n][s->dsp.idct_permutation[i ]]; const int level = block[n][s->dsp.idct_permutation[i]];
block[n][s->dsp.idct_permutation[i ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); block[n][s->dsp.idct_permutation[i]] = level - ROUNDED_DIV(ac_val[i + 8] * qscale_table[xy], s->qscale);
ac_val1[i ]= block[n][s->dsp.idct_permutation[i<<3]]; ac_val1[i] = block[n][s->dsp.idct_permutation[i << 3]];
ac_val1[i+8]= level; ac_val1[i + 8] = level;
} }
} }
st[n]= s->intra_h_scantable.permutated; st[n] = s->intra_h_scantable.permutated;
}else{ } else {
const int xy= s->mb_x-1 + s->mb_y*s->mb_stride; const int xy = s->mb_x - 1 + s->mb_y * s->mb_stride;
/* left prediction */ /* left prediction */
ac_val-= 16; ac_val -= 16;
if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){ if (s->mb_x == 0 || s->qscale == qscale_table[xy] || n == 1 || n == 3) {
/* same qscale */ /* same qscale */
for(i=1; i<8; i++){ for (i = 1; i < 8; i++) {
const int level= block[n][s->dsp.idct_permutation[i<<3]]; const int level = block[n][s->dsp.idct_permutation[i << 3]];
block[n][s->dsp.idct_permutation[i<<3]]= level - ac_val[i]; block[n][s->dsp.idct_permutation[i << 3]] = level - ac_val[i];
ac_val1[i ]= level; ac_val1[i] = level;
ac_val1[i+8]= block[n][s->dsp.idct_permutation[i ]]; ac_val1[i + 8] = block[n][s->dsp.idct_permutation[i]];
} }
}else{ } else {
/* different qscale, we must rescale */ /* different qscale, we must rescale */
for(i=1; i<8; i++){ for (i = 1; i < 8; i++) {
const int level= block[n][s->dsp.idct_permutation[i<<3]]; const int level = block[n][s->dsp.idct_permutation[i << 3]];
block[n][s->dsp.idct_permutation[i<<3]]= level - ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale); block[n][s->dsp.idct_permutation[i << 3]] = level - ROUNDED_DIV(ac_val[i] * qscale_table[xy], s->qscale);
ac_val1[i ]= level; ac_val1[i] = level;
ac_val1[i+8]= block[n][s->dsp.idct_permutation[i ]]; ac_val1[i + 8] = block[n][s->dsp.idct_permutation[i]];
} }
} }
st[n]= s->intra_v_scantable.permutated; st[n] = s->intra_v_scantable.permutated;
} }
for(i=63; i>0; i--) //FIXME optimize for (i = 63; i > 0; i--) // FIXME optimize
if(block[n][ st[n][i] ]) break; if (block[n][st[n][i]])
s->block_last_index[n]= i; break;
s->block_last_index[n] = i;
score += get_block_rate(s, block[n], s->block_last_index[n], st[n]); score += get_block_rate(s, block[n], s->block_last_index[n], st[n]);
} }
if(score < 0){ if (score < 0) {
return 1; return 1;
}else{ } else {
restore_ac_coeffs(s, block, dir, st, zigzag_last_index); restore_ac_coeffs(s, block, dir, st, zigzag_last_index);
return 0; return 0;
} }
...@@ -202,51 +209,55 @@ static inline int decide_ac_pred(MpegEncContext * s, int16_t block[6][64], const ...@@ -202,51 +209,55 @@ static inline int decide_ac_pred(MpegEncContext * s, int16_t block[6][64], const
/** /**
* modify mb_type & qscale so that encoding is actually possible in mpeg4 * modify mb_type & qscale so that encoding is actually possible in mpeg4
*/ */
void ff_clean_mpeg4_qscales(MpegEncContext *s){ void ff_clean_mpeg4_qscales(MpegEncContext *s)
{
int i; int i;
int8_t * const qscale_table = s->current_picture.qscale_table; int8_t *const qscale_table = s->current_picture.qscale_table;
ff_clean_h263_qscales(s); ff_clean_h263_qscales(s);
if(s->pict_type== AV_PICTURE_TYPE_B){ if (s->pict_type == AV_PICTURE_TYPE_B) {
int odd=0; int odd = 0;
/* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */ /* ok, come on, this isn't funny anymore, there's more code for
* handling this mpeg4 mess than for the actual adaptive quantization */
for(i=0; i<s->mb_num; i++){ for (i = 0; i < s->mb_num; i++) {
int mb_xy= s->mb_index2xy[i]; int mb_xy = s->mb_index2xy[i];
odd += qscale_table[mb_xy]&1; odd += qscale_table[mb_xy] & 1;
} }
if(2*odd > s->mb_num) odd=1; if (2 * odd > s->mb_num)
else odd=0; odd = 1;
else
odd = 0;
for(i=0; i<s->mb_num; i++){ for (i = 0; i < s->mb_num; i++) {
int mb_xy= s->mb_index2xy[i]; int mb_xy = s->mb_index2xy[i];
if((qscale_table[mb_xy]&1) != odd) if ((qscale_table[mb_xy] & 1) != odd)
qscale_table[mb_xy]++; qscale_table[mb_xy]++;
if(qscale_table[mb_xy] > 31) if (qscale_table[mb_xy] > 31)
qscale_table[mb_xy]= 31; qscale_table[mb_xy] = 31;
} }
for(i=1; i<s->mb_num; i++){ for (i = 1; i < s->mb_num; i++) {
int mb_xy= s->mb_index2xy[i]; int mb_xy = s->mb_index2xy[i];
if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){ if (qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i - 1]] &&
s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR; (s->mb_type[mb_xy] & CANDIDATE_MB_TYPE_DIRECT)) {
s->mb_type[mb_xy] |= CANDIDATE_MB_TYPE_BIDIR;
} }
} }
} }
} }
/** /**
* Encode the dc value. * Encode the dc value.
* @param n block index (0-3 are luma, 4-5 are chroma) * @param n block index (0-3 are luma, 4-5 are chroma)
*/ */
static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n) static inline void mpeg4_encode_dc(PutBitContext *s, int level, int n)
{ {
#if 1 #if 1
/* DC will overflow if level is outside the [-255,255] range. */ /* DC will overflow if level is outside the [-255,255] range. */
level+=256; level += 256;
if (n < 4) { if (n < 4) {
/* luminance */ /* luminance */
put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]); put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]);
...@@ -283,85 +294,98 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n) ...@@ -283,85 +294,98 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
#endif #endif
} }
static inline int mpeg4_get_dc_length(int level, int n){ static inline int mpeg4_get_dc_length(int level, int n)
if (n < 4) { {
if (n < 4)
return uni_DCtab_lum_len[level + 256]; return uni_DCtab_lum_len[level + 256];
} else { else
return uni_DCtab_chrom_len[level + 256]; return uni_DCtab_chrom_len[level + 256];
}
} }
/** /**
* Encode an 8x8 block. * Encode an 8x8 block.
* @param n block index (0-3 are luma, 4-5 are chroma) * @param n block index (0-3 are luma, 4-5 are chroma)
*/ */
static inline void mpeg4_encode_block(MpegEncContext * s, int16_t * block, int n, int intra_dc, static inline void mpeg4_encode_block(MpegEncContext *s,
uint8_t *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb) int16_t *block, int n, int intra_dc,
uint8_t *scan_table, PutBitContext *dc_pb,
PutBitContext *ac_pb)
{ {
int i, last_non_zero; int i, last_non_zero;
uint32_t *bits_tab; uint32_t *bits_tab;
uint8_t *len_tab; uint8_t *len_tab;
const int last_index = s->block_last_index[n]; 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 based DC predictor */
mpeg4_encode_dc(dc_pb, intra_dc, n); mpeg4_encode_dc(dc_pb, intra_dc, n);
if(last_index<1) return; if (last_index < 1)
return;
i = 1; i = 1;
bits_tab= uni_mpeg4_intra_rl_bits; bits_tab = uni_mpeg4_intra_rl_bits;
len_tab = uni_mpeg4_intra_rl_len; len_tab = uni_mpeg4_intra_rl_len;
} else { } else {
if(last_index<0) return; if (last_index < 0)
return;
i = 0; i = 0;
bits_tab= uni_mpeg4_inter_rl_bits; bits_tab = uni_mpeg4_inter_rl_bits;
len_tab = uni_mpeg4_inter_rl_len; len_tab = uni_mpeg4_inter_rl_len;
} }
/* AC coefs */ /* AC coefs */
last_non_zero = i - 1; last_non_zero = i - 1;
for (; i < last_index; i++) { for (; i < last_index; i++) {
int level = block[ scan_table[i] ]; int level = block[scan_table[i]];
if (level) { if (level) {
int run = i - last_non_zero - 1; int run = i - last_non_zero - 1;
level+=64; level += 64;
if((level&(~127)) == 0){ if ((level & (~127)) == 0) {
const int index= UNI_MPEG4_ENC_INDEX(0, run, level); const int index = UNI_MPEG4_ENC_INDEX(0, run, level);
put_bits(ac_pb, len_tab[index], bits_tab[index]); 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); 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; last_non_zero = i;
} }
} }
/*if(i<=last_index)*/{ /* if (i <= last_index) */ {
int level = block[ scan_table[i] ]; int level = block[scan_table[i]];
int run = i - last_non_zero - 1; int run = i - last_non_zero - 1;
level+=64; level += 64;
if((level&(~127)) == 0){ if ((level & (~127)) == 0) {
const int index= UNI_MPEG4_ENC_INDEX(1, run, level); const int index = UNI_MPEG4_ENC_INDEX(1, run, level);
put_bits(ac_pb, len_tab[index], bits_tab[index]); 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); 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);
} }
} }
} }
static int mpeg4_get_block_length(MpegEncContext * s, int16_t * block, int n, int intra_dc, static int mpeg4_get_block_length(MpegEncContext *s,
uint8_t *scan_table) int16_t *block, int n,
int intra_dc, uint8_t *scan_table)
{ {
int i, last_non_zero; int i, last_non_zero;
uint8_t *len_tab; uint8_t *len_tab;
const int last_index = s->block_last_index[n]; const int last_index = s->block_last_index[n];
int len=0; int len = 0;
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 based DC predictor */
len += mpeg4_get_dc_length(intra_dc, n); len += mpeg4_get_dc_length(intra_dc, n);
if(last_index<1) return len; if (last_index < 1)
return len;
i = 1; i = 1;
len_tab = uni_mpeg4_intra_rl_len; len_tab = uni_mpeg4_intra_rl_len;
} else { } else {
if(last_index<0) return 0; if (last_index < 0)
return 0;
i = 0; i = 0;
len_tab = uni_mpeg4_inter_rl_len; len_tab = uni_mpeg4_inter_rl_len;
} }
...@@ -369,64 +393,69 @@ static int mpeg4_get_block_length(MpegEncContext * s, int16_t * block, int n, in ...@@ -369,64 +393,69 @@ static int mpeg4_get_block_length(MpegEncContext * s, int16_t * block, int n, in
/* AC coefs */ /* AC coefs */
last_non_zero = i - 1; last_non_zero = i - 1;
for (; i < last_index; i++) { for (; i < last_index; i++) {
int level = block[ scan_table[i] ]; int level = block[scan_table[i]];
if (level) { if (level) {
int run = i - last_non_zero - 1; int run = i - last_non_zero - 1;
level+=64; level += 64;
if((level&(~127)) == 0){ if ((level & (~127)) == 0) {
const int index= UNI_MPEG4_ENC_INDEX(0, run, level); const int index = UNI_MPEG4_ENC_INDEX(0, run, level);
len += len_tab[index]; len += len_tab[index];
}else{ //ESC3 } else { // ESC3
len += 7+2+1+6+1+12+1; len += 7 + 2 + 1 + 6 + 1 + 12 + 1;
} }
last_non_zero = i; last_non_zero = i;
} }
} }
/*if(i<=last_index)*/{ /* if (i <= last_index) */ {
int level = block[ scan_table[i] ]; int level = block[scan_table[i]];
int run = i - last_non_zero - 1; int run = i - last_non_zero - 1;
level+=64; level += 64;
if((level&(~127)) == 0){ if ((level & (~127)) == 0) {
const int index= UNI_MPEG4_ENC_INDEX(1, run, level); const int index = UNI_MPEG4_ENC_INDEX(1, run, level);
len += len_tab[index]; len += len_tab[index];
}else{ //ESC3 } else { // ESC3
len += 7+2+1+6+1+12+1; len += 7 + 2 + 1 + 6 + 1 + 12 + 1;
} }
} }
return len; return len;
} }
static inline void mpeg4_encode_blocks(MpegEncContext * s, int16_t block[6][64], int intra_dc[6], static inline void mpeg4_encode_blocks(MpegEncContext *s, int16_t block[6][64],
uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){ int intra_dc[6], uint8_t **scan_table,
PutBitContext *dc_pb,
PutBitContext *ac_pb)
{
int i; int i;
if(scan_table){ if (scan_table) {
if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ if (s->flags2 & CODEC_FLAG2_NO_OUTPUT) {
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++)
skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i])); skip_put_bits(&s->pb,
} mpeg4_get_block_length(s, block[i], i,
}else{ intra_dc[i], scan_table[i]));
} else {
/* encode each block */ /* encode each block */
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++)
mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb); mpeg4_encode_block(s, block[i], i,
} intra_dc[i], scan_table[i], dc_pb, ac_pb);
}
}else{
if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){
for (i = 0; i < 6; i++) {
skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated));
} }
}else{ } else {
if (s->flags2 & CODEC_FLAG2_NO_OUTPUT) {
for (i = 0; i < 6; i++)
skip_put_bits(&s->pb,
mpeg4_get_block_length(s, block[i], i, 0,
s->intra_scantable.permutated));
} else {
/* encode each block */ /* encode each block */
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++)
mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb); mpeg4_encode_block(s, block[i], i, 0,
} s->intra_scantable.permutated, dc_pb, ac_pb);
} }
} }
} }
static inline int get_b_cbp(MpegEncContext * s, int16_t block[6][64], static inline int get_b_cbp(MpegEncContext *s, int16_t block[6][64],
int motion_x, int motion_y, int mb_type) int motion_x, int motion_y, int mb_type)
{ {
int cbp = 0, i; int cbp = 0, i;
...@@ -435,16 +464,17 @@ static inline int get_b_cbp(MpegEncContext * s, int16_t block[6][64], ...@@ -435,16 +464,17 @@ static inline int get_b_cbp(MpegEncContext * s, int16_t block[6][64],
int score = 0; int score = 0;
const int lambda = s->lambda2 >> (FF_LAMBDA_SHIFT - 6); const int lambda = s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++) {
if (s->coded_score[i] < 0) { if (s->coded_score[i] < 0) {
score += s->coded_score[i]; score += s->coded_score[i];
cbp |= 1 << (5 - i); cbp |= 1 << (5 - i);
} }
}
if (cbp) { if (cbp) {
int zero_score = -6; int zero_score = -6;
if ((motion_x | motion_y | s->dquant | mb_type) == 0) if ((motion_x | motion_y | s->dquant | mb_type) == 0)
zero_score -= 4; //2*MV + mb_type + cbp bit zero_score -= 4; // 2 * MV + mb_type + cbp bit
zero_score *= lambda; zero_score *= lambda;
if (zero_score <= score) if (zero_score <= score)
...@@ -466,62 +496,61 @@ static inline int get_b_cbp(MpegEncContext * s, int16_t block[6][64], ...@@ -466,62 +496,61 @@ static inline int get_b_cbp(MpegEncContext * s, int16_t block[6][64],
return cbp; return cbp;
} }
//FIXME this is duplicated to h263.c // FIXME this is duplicated to h263.c
static const int dquant_code[5]= {1,0,9,2,3}; static const int dquant_code[5] = { 1, 0, 9, 2, 3 };
void ff_mpeg4_encode_mb(MpegEncContext * s, void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
int16_t block[6][64],
int motion_x, int motion_y) int motion_x, int motion_y)
{ {
int cbpc, cbpy, pred_x, pred_y; int cbpc, cbpy, pred_x, pred_y;
PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb; PutBitContext *const pb2 = s->data_partitioning ? &s->pb2 : &s->pb;
PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_B ? &s->tex_pb : &s->pb; PutBitContext *const tex_pb = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_B ? &s->tex_pb : &s->pb;
PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_I ? &s->pb2 : &s->pb; PutBitContext *const dc_pb = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_I ? &s->pb2 : &s->pb;
const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0; const int interleaved_stats = (s->flags & CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0;
if (!s->mb_intra) { if (!s->mb_intra) {
int i, cbp; int i, cbp;
if(s->pict_type==AV_PICTURE_TYPE_B){ if (s->pict_type == AV_PICTURE_TYPE_B) {
static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */ /* convert from mv_dir to type */
int mb_type= mb_type_table[s->mv_dir]; static const int mb_type_table[8] = { -1, 3, 2, 1, -1, -1, -1, 0 };
int mb_type = mb_type_table[s->mv_dir];
if(s->mb_x==0){ if (s->mb_x == 0) {
for(i=0; i<2; i++){ for (i = 0; i < 2; i++)
s->last_mv[i][0][0]= s->last_mv[i][0][0] =
s->last_mv[i][0][1]= s->last_mv[i][0][1] =
s->last_mv[i][1][0]= s->last_mv[i][1][0] =
s->last_mv[i][1][1]= 0; s->last_mv[i][1][1] = 0;
}
} }
av_assert2(s->dquant>=-2 && s->dquant<=2); av_assert2(s->dquant >= -2 && s->dquant <= 2);
av_assert2((s->dquant&1)==0); av_assert2((s->dquant & 1) == 0);
av_assert2(mb_type>=0); av_assert2(mb_type >= 0);
/* nothing to do if this MB was skipped in the next P Frame */ /* nothing to do if this MB was skipped in the next P Frame */
if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { //FIXME avoid DCT & ... if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { // FIXME avoid DCT & ...
s->skip_count++; s->skip_count++;
s->mv[0][0][0]= s->mv[0][0][0] =
s->mv[0][0][1]= s->mv[0][0][1] =
s->mv[1][0][0]= s->mv[1][0][0] =
s->mv[1][0][1]= 0; s->mv[1][0][1] = 0;
s->mv_dir= MV_DIR_FORWARD; //doesn't matter s->mv_dir = MV_DIR_FORWARD; // doesn't matter
s->qscale -= s->dquant; s->qscale -= s->dquant;
// s->mb_skipped=1; // s->mb_skipped = 1;
return; return;
} }
cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type); cbp = get_b_cbp(s, block, motion_x, motion_y, mb_type);
if ((cbp | motion_x | motion_y | mb_type) ==0) { if ((cbp | motion_x | motion_y | mb_type) == 0) {
/* direct MB with MV={0,0} */ /* direct MB with MV={0,0} */
av_assert2(s->dquant==0); av_assert2(s->dquant == 0);
put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */ put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */
if(interleaved_stats){ if (interleaved_stats) {
s->misc_bits++; s->misc_bits++;
s->last_bits++; s->last_bits++;
} }
...@@ -530,148 +559,159 @@ void ff_mpeg4_encode_mb(MpegEncContext * s, ...@@ -530,148 +559,159 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
} }
put_bits(&s->pb, 1, 0); /* mb coded modb1=0 */ 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, 1, cbp ? 0 : 1); /* modb2 */ // FIXME merge
put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :) put_bits(&s->pb, mb_type + 1, 1); // this table is so simple that we don't need it :)
if(cbp) put_bits(&s->pb, 6, cbp); if (cbp)
put_bits(&s->pb, 6, cbp);
if(cbp && mb_type){
if(s->dquant) if (cbp && mb_type) {
put_bits(&s->pb, 2, (s->dquant>>2)+3); if (s->dquant)
put_bits(&s->pb, 2, (s->dquant >> 2) + 3);
else else
put_bits(&s->pb, 1, 0); put_bits(&s->pb, 1, 0);
}else } else
s->qscale -= s->dquant; s->qscale -= s->dquant;
if(!s->progressive_sequence){ if (!s->progressive_sequence) {
if(cbp) if (cbp)
put_bits(&s->pb, 1, s->interlaced_dct); put_bits(&s->pb, 1, s->interlaced_dct);
if(mb_type) // not direct mode if (mb_type) // not direct mode
put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD); put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD);
} }
if(interleaved_stats){ if (interleaved_stats)
s->misc_bits+= get_bits_diff(s); s->misc_bits += get_bits_diff(s);
}
if(mb_type == 0){ if (!mb_type) {
av_assert2(s->mv_dir & MV_DIRECT); av_assert2(s->mv_dir & MV_DIRECT);
ff_h263_encode_motion_vector(s, motion_x, motion_y, 1); ff_h263_encode_motion_vector(s, motion_x, motion_y, 1);
s->b_count++; s->b_count++;
s->f_count++; s->f_count++;
}else{ } else {
av_assert2(mb_type > 0 && mb_type < 4); av_assert2(mb_type > 0 && mb_type < 4);
if(s->mv_type != MV_TYPE_FIELD){ if (s->mv_type != MV_TYPE_FIELD) {
if(s->mv_dir & MV_DIR_FORWARD){ if (s->mv_dir & MV_DIR_FORWARD) {
ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0], ff_h263_encode_motion_vector(s,
s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); s->mv[0][0][0] - s->last_mv[0][0][0],
s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0]; s->mv[0][0][1] - s->last_mv[0][0][1],
s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1]; s->f_code);
s->last_mv[0][0][0] =
s->last_mv[0][1][0] = s->mv[0][0][0];
s->last_mv[0][0][1] =
s->last_mv[0][1][1] = s->mv[0][0][1];
s->f_count++; s->f_count++;
} }
if(s->mv_dir & MV_DIR_BACKWARD){ if (s->mv_dir & MV_DIR_BACKWARD) {
ff_h263_encode_motion_vector(s, s->mv[1][0][0] - s->last_mv[1][0][0], ff_h263_encode_motion_vector(s,
s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); s->mv[1][0][0] - s->last_mv[1][0][0],
s->last_mv[1][0][0]= s->last_mv[1][1][0]= s->mv[1][0][0]; s->mv[1][0][1] - s->last_mv[1][0][1],
s->last_mv[1][0][1]= s->last_mv[1][1][1]= s->mv[1][0][1]; s->b_code);
s->last_mv[1][0][0] =
s->last_mv[1][1][0] = s->mv[1][0][0];
s->last_mv[1][0][1] =
s->last_mv[1][1][1] = s->mv[1][0][1];
s->b_count++; s->b_count++;
} }
}else{ } else {
if(s->mv_dir & MV_DIR_FORWARD){ if (s->mv_dir & MV_DIR_FORWARD) {
put_bits(&s->pb, 1, s->field_select[0][0]); put_bits(&s->pb, 1, s->field_select[0][0]);
put_bits(&s->pb, 1, s->field_select[0][1]); put_bits(&s->pb, 1, s->field_select[0][1]);
} }
if(s->mv_dir & MV_DIR_BACKWARD){ if (s->mv_dir & MV_DIR_BACKWARD) {
put_bits(&s->pb, 1, s->field_select[1][0]); put_bits(&s->pb, 1, s->field_select[1][0]);
put_bits(&s->pb, 1, s->field_select[1][1]); put_bits(&s->pb, 1, s->field_select[1][1]);
} }
if(s->mv_dir & MV_DIR_FORWARD){ if (s->mv_dir & MV_DIR_FORWARD) {
for(i=0; i<2; i++){ for (i = 0; i < 2; i++) {
ff_h263_encode_motion_vector(s, s->mv[0][i][0] - s->last_mv[0][i][0] , ff_h263_encode_motion_vector(s,
s->mv[0][i][1] - s->last_mv[0][i][1]/2, s->f_code); s->mv[0][i][0] - s->last_mv[0][i][0],
s->last_mv[0][i][0]= s->mv[0][i][0]; s->mv[0][i][1] - s->last_mv[0][i][1] / 2,
s->last_mv[0][i][1]= s->mv[0][i][1]*2; s->f_code);
s->last_mv[0][i][0] = s->mv[0][i][0];
s->last_mv[0][i][1] = s->mv[0][i][1] * 2;
} }
s->f_count++; s->f_count++;
} }
if(s->mv_dir & MV_DIR_BACKWARD){ if (s->mv_dir & MV_DIR_BACKWARD) {
for(i=0; i<2; i++){ for (i = 0; i < 2; i++) {
ff_h263_encode_motion_vector(s, s->mv[1][i][0] - s->last_mv[1][i][0] , ff_h263_encode_motion_vector(s,
s->mv[1][i][1] - s->last_mv[1][i][1]/2, s->b_code); s->mv[1][i][0] - s->last_mv[1][i][0],
s->last_mv[1][i][0]= s->mv[1][i][0]; s->mv[1][i][1] - s->last_mv[1][i][1] / 2,
s->last_mv[1][i][1]= s->mv[1][i][1]*2; s->b_code);
s->last_mv[1][i][0] = s->mv[1][i][0];
s->last_mv[1][i][1] = s->mv[1][i][1] * 2;
} }
s->b_count++; s->b_count++;
} }
} }
} }
if(interleaved_stats){ if (interleaved_stats)
s->mv_bits+= get_bits_diff(s); s->mv_bits += get_bits_diff(s);
}
mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb); mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb);
if(interleaved_stats){ if (interleaved_stats)
s->p_tex_bits+= get_bits_diff(s); s->p_tex_bits += get_bits_diff(s);
} } else { /* s->pict_type==AV_PICTURE_TYPE_B */
cbp = get_p_cbp(s, block, motion_x, motion_y);
}else{ /* s->pict_type==AV_PICTURE_TYPE_B */
cbp= get_p_cbp(s, block, motion_x, motion_y); if ((cbp | motion_x | motion_y | s->dquant) == 0 &&
s->mv_type == MV_TYPE_16X16) {
if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16) { /* check if the B frames can skip it too, as we must skip it
/* check if the B frames can skip it too, as we must skip it if we skip here * if we skip here why didn't they just compress
why didn't they just compress the skip-mb bits instead of reusing them ?! */ * the skip-mb bits instead of reusing them ?! */
if(s->max_b_frames>0){ if (s->max_b_frames > 0) {
int i; int i;
int x,y, offset; int x, y, offset;
uint8_t *p_pic; uint8_t *p_pic;
x= s->mb_x*16; x = s->mb_x * 16;
y= s->mb_y*16; y = s->mb_y * 16;
offset= x + y*s->linesize; offset = x + y * s->linesize;
p_pic = s->new_picture.f.data[0] + offset; p_pic = s->new_picture.f.data[0] + offset;
s->mb_skipped=1; s->mb_skipped = 1;
for(i=0; i<s->max_b_frames; i++){ for (i = 0; i < s->max_b_frames; i++) {
uint8_t *b_pic; uint8_t *b_pic;
int diff; int diff;
Picture *pic= s->reordered_input_picture[i+1]; Picture *pic = s->reordered_input_picture[i + 1];
if (pic == NULL || pic->f.pict_type != AV_PICTURE_TYPE_B) if (!pic || pic->f.pict_type != AV_PICTURE_TYPE_B)
break; break;
b_pic = pic->f.data[0] + offset; b_pic = pic->f.data[0] + offset;
if (!pic->shared) if (!pic->shared)
b_pic+= INPLACE_OFFSET; b_pic += INPLACE_OFFSET;
if(x+16 > s->width || y+16 > s->height){ if (x + 16 > s->width || y + 16 > s->height) {
int x1,y1; int x1, y1;
int xe= FFMIN(16, s->width - x); int xe = FFMIN(16, s->width - x);
int ye= FFMIN(16, s->height- y); int ye = FFMIN(16, s->height - y);
diff=0; diff = 0;
for(y1=0; y1<ye; y1++){ for (y1 = 0; y1 < ye; y1++) {
for(x1=0; x1<xe; x1++){ for (x1 = 0; x1 < xe; x1++) {
diff+= FFABS(p_pic[x1+y1*s->linesize] - b_pic[x1+y1*s->linesize]); diff += FFABS(p_pic[x1 + y1 * s->linesize] - b_pic[x1 + y1 * s->linesize]);
} }
} }
diff= diff*256/(xe*ye); diff = diff * 256 / (xe * ye);
}else{ } else {
diff= s->dsp.sad[0](NULL, p_pic, b_pic, s->linesize, 16); diff = s->dsp.sad[0](NULL, p_pic, b_pic, s->linesize, 16);
} }
if(diff>s->qscale*70){ //FIXME check that 70 is optimal if (diff > s->qscale * 70) { // FIXME check that 70 is optimal
s->mb_skipped=0; s->mb_skipped = 0;
break; break;
} }
} }
}else } else
s->mb_skipped=1; s->mb_skipped = 1;
if(s->mb_skipped==1){ if (s->mb_skipped == 1) {
/* skip macroblock */ /* skip macroblock */
put_bits(&s->pb, 1, 1); put_bits(&s->pb, 1, 1);
if(interleaved_stats){ if (interleaved_stats) {
s->misc_bits++; s->misc_bits++;
s->last_bits++; s->last_bits++;
} }
...@@ -685,131 +725,135 @@ void ff_mpeg4_encode_mb(MpegEncContext * s, ...@@ -685,131 +725,135 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
cbpc = cbp & 3; cbpc = cbp & 3;
cbpy = cbp >> 2; cbpy = cbp >> 2;
cbpy ^= 0xf; cbpy ^= 0xf;
if(s->mv_type==MV_TYPE_16X16){ if (s->mv_type == MV_TYPE_16X16) {
if(s->dquant) cbpc+= 8; if (s->dquant)
cbpc += 8;
put_bits(&s->pb, put_bits(&s->pb,
ff_h263_inter_MCBPC_bits[cbpc], ff_h263_inter_MCBPC_bits[cbpc],
ff_h263_inter_MCBPC_code[cbpc]); ff_h263_inter_MCBPC_code[cbpc]);
put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]); put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
if(s->dquant) if (s->dquant)
put_bits(pb2, 2, dquant_code[s->dquant+2]); put_bits(pb2, 2, dquant_code[s->dquant + 2]);
if(!s->progressive_sequence){ if (!s->progressive_sequence) {
if(cbp) if (cbp)
put_bits(pb2, 1, s->interlaced_dct); put_bits(pb2, 1, s->interlaced_dct);
put_bits(pb2, 1, 0); put_bits(pb2, 1, 0);
} }
if(interleaved_stats){ if (interleaved_stats)
s->misc_bits+= get_bits_diff(s); s->misc_bits += get_bits_diff(s);
}
/* motion vectors: 16x16 mode */ /* motion vectors: 16x16 mode */
ff_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_y - pred_y, s->f_code); motion_x - pred_x,
}else if(s->mv_type==MV_TYPE_FIELD){ motion_y - pred_y,
if(s->dquant) cbpc+= 8; s->f_code);
} else if (s->mv_type == MV_TYPE_FIELD) {
if (s->dquant)
cbpc += 8;
put_bits(&s->pb, put_bits(&s->pb,
ff_h263_inter_MCBPC_bits[cbpc], ff_h263_inter_MCBPC_bits[cbpc],
ff_h263_inter_MCBPC_code[cbpc]); ff_h263_inter_MCBPC_code[cbpc]);
put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]); put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
if(s->dquant) if (s->dquant)
put_bits(pb2, 2, dquant_code[s->dquant+2]); put_bits(pb2, 2, dquant_code[s->dquant + 2]);
av_assert2(!s->progressive_sequence); av_assert2(!s->progressive_sequence);
if(cbp) if (cbp)
put_bits(pb2, 1, s->interlaced_dct); put_bits(pb2, 1, s->interlaced_dct);
put_bits(pb2, 1, 1); put_bits(pb2, 1, 1);
if(interleaved_stats){ if (interleaved_stats)
s->misc_bits+= get_bits_diff(s); s->misc_bits += get_bits_diff(s);
}
/* motion vectors: 16x8 interlaced mode */ /* motion vectors: 16x8 interlaced mode */
ff_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]);
put_bits(&s->pb, 1, s->field_select[0][1]); put_bits(&s->pb, 1, s->field_select[0][1]);
ff_h263_encode_motion_vector(s, s->mv[0][0][0] - pred_x, ff_h263_encode_motion_vector(s,
s->mv[0][0][1] - pred_y, s->f_code); s->mv[0][0][0] - pred_x,
ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x, s->mv[0][0][1] - pred_y,
s->mv[0][1][1] - pred_y, s->f_code); s->f_code);
}else{ ff_h263_encode_motion_vector(s,
av_assert2(s->mv_type==MV_TYPE_8X8); s->mv[0][1][0] - pred_x,
s->mv[0][1][1] - pred_y,
s->f_code);
} else {
av_assert2(s->mv_type == MV_TYPE_8X8);
put_bits(&s->pb, put_bits(&s->pb,
ff_h263_inter_MCBPC_bits[cbpc+16], ff_h263_inter_MCBPC_bits[cbpc + 16],
ff_h263_inter_MCBPC_code[cbpc+16]); ff_h263_inter_MCBPC_code[cbpc + 16]);
put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]); put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
if(!s->progressive_sequence){ if (!s->progressive_sequence && cbp)
if(cbp)
put_bits(pb2, 1, s->interlaced_dct); put_bits(pb2, 1, s->interlaced_dct);
}
if(interleaved_stats){ if (interleaved_stats)
s->misc_bits+= get_bits_diff(s); s->misc_bits += get_bits_diff(s);
}
for(i=0; i<4; i++){ for (i = 0; i < 4; i++) {
/* motion vectors: 8x8 mode*/ /* motion vectors: 8x8 mode*/
ff_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.motion_val[0][ s->block_index[i] ][0] - pred_x, ff_h263_encode_motion_vector(s,
s->current_picture.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code); s->current_picture.motion_val[0][s->block_index[i]][0] - pred_x,
s->current_picture.motion_val[0][s->block_index[i]][1] - pred_y,
s->f_code);
} }
} }
if(interleaved_stats){ if (interleaved_stats)
s->mv_bits+= get_bits_diff(s); s->mv_bits += get_bits_diff(s);
}
mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb); mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb);
if(interleaved_stats){ if (interleaved_stats)
s->p_tex_bits+= get_bits_diff(s); s->p_tex_bits += get_bits_diff(s);
}
s->f_count++; s->f_count++;
} }
} else { } else {
int cbp; int cbp;
int dc_diff[6]; //dc values with the dc prediction subtracted int dc_diff[6]; // dc values with the dc prediction subtracted
int dir[6]; //prediction direction int dir[6]; // prediction direction
int zigzag_last_index[6]; int zigzag_last_index[6];
uint8_t *scan_table[6]; uint8_t *scan_table[6];
int i; int i;
for(i=0; i<6; i++){ for (i = 0; i < 6; i++)
dc_diff[i]= ff_mpeg4_pred_dc(s, i, block[i][0], &dir[i], 1); dc_diff[i] = ff_mpeg4_pred_dc(s, i, block[i][0], &dir[i], 1);
}
if(s->flags & CODEC_FLAG_AC_PRED){ if (s->flags & CODEC_FLAG_AC_PRED) {
s->ac_pred= decide_ac_pred(s, block, dir, scan_table, zigzag_last_index); s->ac_pred = decide_ac_pred(s, block, dir, scan_table, zigzag_last_index);
}else{ } else {
for(i=0; i<6; i++) for (i = 0; i < 6; i++)
scan_table[i]= s->intra_scantable.permutated; scan_table[i] = s->intra_scantable.permutated;
} }
/* compute cbp */ /* compute cbp */
cbp = 0; cbp = 0;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++)
if (s->block_last_index[i] >= 1) if (s->block_last_index[i] >= 1)
cbp |= 1 << (5 - i); cbp |= 1 << (5 - i);
}
cbpc = cbp & 3; cbpc = cbp & 3;
if (s->pict_type == AV_PICTURE_TYPE_I) { if (s->pict_type == AV_PICTURE_TYPE_I) {
if(s->dquant) cbpc+=4; if (s->dquant)
cbpc += 4;
put_bits(&s->pb, put_bits(&s->pb,
ff_h263_intra_MCBPC_bits[cbpc], ff_h263_intra_MCBPC_bits[cbpc],
ff_h263_intra_MCBPC_code[cbpc]); ff_h263_intra_MCBPC_code[cbpc]);
} else { } else {
if(s->dquant) cbpc+=8; if (s->dquant)
cbpc += 8;
put_bits(&s->pb, 1, 0); /* mb coded */ put_bits(&s->pb, 1, 0); /* mb coded */
put_bits(&s->pb, put_bits(&s->pb,
ff_h263_inter_MCBPC_bits[cbpc + 4], ff_h263_inter_MCBPC_bits[cbpc + 4],
...@@ -818,26 +862,24 @@ void ff_mpeg4_encode_mb(MpegEncContext * s, ...@@ -818,26 +862,24 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
put_bits(pb2, 1, s->ac_pred); put_bits(pb2, 1, s->ac_pred);
cbpy = cbp >> 2; cbpy = cbp >> 2;
put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]); put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
if(s->dquant) if (s->dquant)
put_bits(dc_pb, 2, dquant_code[s->dquant+2]); put_bits(dc_pb, 2, dquant_code[s->dquant + 2]);
if(!s->progressive_sequence){ if (!s->progressive_sequence)
put_bits(dc_pb, 1, s->interlaced_dct); put_bits(dc_pb, 1, s->interlaced_dct);
}
if(interleaved_stats){ if (interleaved_stats)
s->misc_bits+= get_bits_diff(s); s->misc_bits += get_bits_diff(s);
}
mpeg4_encode_blocks(s, block, dc_diff, scan_table, dc_pb, tex_pb); mpeg4_encode_blocks(s, block, dc_diff, scan_table, dc_pb, tex_pb);
if(interleaved_stats){ if (interleaved_stats)
s->i_tex_bits+= get_bits_diff(s); s->i_tex_bits += get_bits_diff(s);
}
s->i_count++; s->i_count++;
/* restore ac coeffs & last_index stuff if we messed them up with the prediction */ /* restore ac coeffs & last_index stuff
if(s->ac_pred) * if we messed them up with the prediction */
if (s->ac_pred)
restore_ac_coeffs(s, block, dir, scan_table, zigzag_last_index); restore_ac_coeffs(s, block, dir, scan_table, zigzag_last_index);
} }
} }
...@@ -845,25 +887,28 @@ void ff_mpeg4_encode_mb(MpegEncContext * s, ...@@ -845,25 +887,28 @@ void ff_mpeg4_encode_mb(MpegEncContext * s,
/** /**
* add mpeg4 stuffing bits (01...1) * add mpeg4 stuffing bits (01...1)
*/ */
void ff_mpeg4_stuffing(PutBitContext * pbc) void ff_mpeg4_stuffing(PutBitContext *pbc)
{ {
int length; int length;
put_bits(pbc, 1, 0); put_bits(pbc, 1, 0);
length= (-put_bits_count(pbc))&7; length = (-put_bits_count(pbc)) & 7;
if(length) put_bits(pbc, length, (1<<length)-1); if (length)
put_bits(pbc, length, (1 << length) - 1);
} }
/* must be called before writing the header */ /* must be called before writing the header */
void ff_set_mpeg4_time(MpegEncContext * s){ void ff_set_mpeg4_time(MpegEncContext *s)
if(s->pict_type==AV_PICTURE_TYPE_B){ {
if (s->pict_type == AV_PICTURE_TYPE_B) {
ff_mpeg4_init_direct_mv(s); ff_mpeg4_init_direct_mv(s);
}else{ } else {
s->last_time_base= s->time_base; s->last_time_base = s->time_base;
s->time_base= FFUDIV(s->time, s->avctx->time_base.den); s->time_base = FFUDIV(s->time, s->avctx->time_base.den);
} }
} }
static void mpeg4_encode_gop_header(MpegEncContext * s){ static void mpeg4_encode_gop_header(MpegEncContext *s)
{
int hours, minutes, seconds; int hours, minutes, seconds;
int64_t time; int64_t time;
...@@ -871,13 +916,13 @@ static void mpeg4_encode_gop_header(MpegEncContext * s){ ...@@ -871,13 +916,13 @@ static void mpeg4_encode_gop_header(MpegEncContext * s){
put_bits(&s->pb, 16, GOP_STARTCODE); put_bits(&s->pb, 16, GOP_STARTCODE);
time = s->current_picture_ptr->f.pts; time = s->current_picture_ptr->f.pts;
if(s->reordered_input_picture[1]) if (s->reordered_input_picture[1])
time = FFMIN(time, s->reordered_input_picture[1]->f.pts); time = FFMIN(time, s->reordered_input_picture[1]->f.pts);
time= time*s->avctx->time_base.num; time = time * s->avctx->time_base.num;
s->last_time_base= FFUDIV(time, s->avctx->time_base.den); s->last_time_base = FFUDIV(time, s->avctx->time_base.den);
seconds= FFUDIV(time, s->avctx->time_base.den); seconds = FFUDIV(time, s->avctx->time_base.den);
minutes= FFUDIV(seconds, 60); seconds = FFUMOD(seconds, 60); minutes = FFUDIV(seconds, 60); seconds = FFUMOD(seconds, 60);
hours = FFUDIV(minutes, 60); minutes = FFUMOD(minutes, 60); hours = FFUDIV(minutes, 60); minutes = FFUMOD(minutes, 60);
hours = FFUMOD(hours , 24); hours = FFUMOD(hours , 24);
...@@ -886,37 +931,36 @@ static void mpeg4_encode_gop_header(MpegEncContext * s){ ...@@ -886,37 +931,36 @@ static void mpeg4_encode_gop_header(MpegEncContext * s){
put_bits(&s->pb, 1, 1); put_bits(&s->pb, 1, 1);
put_bits(&s->pb, 6, seconds); put_bits(&s->pb, 6, seconds);
put_bits(&s->pb, 1, !!(s->flags&CODEC_FLAG_CLOSED_GOP)); put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
put_bits(&s->pb, 1, 0); //broken link == NO put_bits(&s->pb, 1, 0); // broken link == NO
ff_mpeg4_stuffing(&s->pb); ff_mpeg4_stuffing(&s->pb);
} }
static void mpeg4_encode_visual_object_header(MpegEncContext * s){ static void mpeg4_encode_visual_object_header(MpegEncContext *s)
{
int profile_and_level_indication; int profile_and_level_indication;
int vo_ver_id; int vo_ver_id;
if(s->avctx->profile != FF_PROFILE_UNKNOWN){ if (s->avctx->profile != FF_PROFILE_UNKNOWN) {
profile_and_level_indication = s->avctx->profile << 4; profile_and_level_indication = s->avctx->profile << 4;
}else if(s->max_b_frames || s->quarter_sample){ } else if (s->max_b_frames || s->quarter_sample) {
profile_and_level_indication= 0xF0; // adv simple profile_and_level_indication = 0xF0; // adv simple
}else{ } else {
profile_and_level_indication= 0x00; // simple profile_and_level_indication = 0x00; // simple
} }
if(s->avctx->level != FF_LEVEL_UNKNOWN){ if (s->avctx->level != FF_LEVEL_UNKNOWN)
profile_and_level_indication |= s->avctx->level; profile_and_level_indication |= s->avctx->level;
}else{ else
profile_and_level_indication |= 1; //level 1 profile_and_level_indication |= 1; // level 1
}
if(profile_and_level_indication>>4 == 0xF){ if (profile_and_level_indication >> 4 == 0xF)
vo_ver_id= 5; vo_ver_id = 5;
}else{ else
vo_ver_id= 1; vo_ver_id = 1;
}
//FIXME levels // FIXME levels
put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0);
put_bits(&s->pb, 16, VOS_STARTCODE); put_bits(&s->pb, 16, VOS_STARTCODE);
...@@ -928,27 +972,30 @@ static void mpeg4_encode_visual_object_header(MpegEncContext * s){ ...@@ -928,27 +972,30 @@ static void mpeg4_encode_visual_object_header(MpegEncContext * s){
put_bits(&s->pb, 1, 1); put_bits(&s->pb, 1, 1);
put_bits(&s->pb, 4, vo_ver_id); put_bits(&s->pb, 4, vo_ver_id);
put_bits(&s->pb, 3, 1); //priority put_bits(&s->pb, 3, 1); // priority
put_bits(&s->pb, 4, 1); //visual obj type== video obj put_bits(&s->pb, 4, 1); // visual obj type== video obj
put_bits(&s->pb, 1, 0); //video signal type == no clue //FIXME put_bits(&s->pb, 1, 0); // video signal type == no clue // FIXME
ff_mpeg4_stuffing(&s->pb); ff_mpeg4_stuffing(&s->pb);
} }
static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number) static void mpeg4_encode_vol_header(MpegEncContext *s,
int vo_number,
int vol_number)
{ {
int vo_ver_id; int vo_ver_id;
if (!CONFIG_MPEG4_ENCODER) return; if (!CONFIG_MPEG4_ENCODER)
return;
if(s->max_b_frames || s->quarter_sample){ if (s->max_b_frames || s->quarter_sample) {
vo_ver_id= 5; vo_ver_id = 5;
s->vo_type= ADV_SIMPLE_VO_TYPE; s->vo_type = ADV_SIMPLE_VO_TYPE;
}else{ } else {
vo_ver_id= 1; vo_ver_id = 1;
s->vo_type= SIMPLE_VO_TYPE; s->vo_type = SIMPLE_VO_TYPE;
} }
put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0);
...@@ -958,7 +1005,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n ...@@ -958,7 +1005,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
put_bits(&s->pb, 1, 0); /* random access vol */ put_bits(&s->pb, 1, 0); /* random access vol */
put_bits(&s->pb, 8, s->vo_type); /* video obj type indication */ put_bits(&s->pb, 8, s->vo_type); /* video obj type indication */
if(s->workaround_bugs & FF_BUG_MS) { if (s->workaround_bugs & FF_BUG_MS) {
put_bits(&s->pb, 1, 0); /* is obj layer id= no */ put_bits(&s->pb, 1, 0); /* is obj layer id= no */
} else { } else {
put_bits(&s->pb, 1, 1); /* is obj layer id= yes */ put_bits(&s->pb, 1, 1); /* is obj layer id= yes */
...@@ -966,17 +1013,17 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n ...@@ -966,17 +1013,17 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
put_bits(&s->pb, 3, 1); /* is obj layer priority */ put_bits(&s->pb, 3, 1); /* is obj layer priority */
} }
s->aspect_ratio_info= ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio); s->aspect_ratio_info = ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio);
put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */ put_bits(&s->pb, 4, s->aspect_ratio_info); /* aspect ratio info */
if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){ if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) {
av_reduce(&s->avctx->sample_aspect_ratio.num, &s->avctx->sample_aspect_ratio.den, av_reduce(&s->avctx->sample_aspect_ratio.num, &s->avctx->sample_aspect_ratio.den,
s->avctx->sample_aspect_ratio.num, s->avctx->sample_aspect_ratio.den, 255); s->avctx->sample_aspect_ratio.num, s->avctx->sample_aspect_ratio.den, 255);
put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num); put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num);
put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den);
} }
if(s->workaround_bugs & FF_BUG_MS) { // if (s->workaround_bugs & FF_BUG_MS) {
put_bits(&s->pb, 1, 0); /* vol control parameters= no @@@ */ put_bits(&s->pb, 1, 0); /* vol control parameters= no @@@ */
} else { } else {
put_bits(&s->pb, 1, 1); /* vol control parameters= yes */ put_bits(&s->pb, 1, 1); /* vol control parameters= yes */
...@@ -1000,16 +1047,15 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n ...@@ -1000,16 +1047,15 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
put_bits(&s->pb, 1, 1); /* marker bit */ put_bits(&s->pb, 1, 1); /* marker bit */
put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1); put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1);
put_bits(&s->pb, 1, 1); /* obmc disable */ put_bits(&s->pb, 1, 1); /* obmc disable */
if (vo_ver_id == 1) { if (vo_ver_id == 1)
put_bits(&s->pb, 1, s->vol_sprite_usage); /* sprite enable */ put_bits(&s->pb, 1, s->vol_sprite_usage); /* sprite enable */
}else{ else
put_bits(&s->pb, 2, s->vol_sprite_usage); /* sprite enable */ put_bits(&s->pb, 2, s->vol_sprite_usage); /* sprite enable */
}
put_bits(&s->pb, 1, 0); /* not 8 bit == false */ put_bits(&s->pb, 1, 0); /* not 8 bit == false */
put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/ put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/
if(s->mpeg_quant){ if (s->mpeg_quant) {
ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix); ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
} }
...@@ -1017,14 +1063,13 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n ...@@ -1017,14 +1063,13 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
if (vo_ver_id != 1) if (vo_ver_id != 1)
put_bits(&s->pb, 1, s->quarter_sample); put_bits(&s->pb, 1, s->quarter_sample);
put_bits(&s->pb, 1, 1); /* complexity estimation disable */ put_bits(&s->pb, 1, 1); /* complexity estimation disable */
s->resync_marker= s->rtp_mode; s->resync_marker = s->rtp_mode;
put_bits(&s->pb, 1, s->resync_marker ? 0 : 1);/* resync marker disable */ put_bits(&s->pb, 1, s->resync_marker ? 0 : 1); /* resync marker disable */
put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0); put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0);
if(s->data_partitioning){ if (s->data_partitioning)
put_bits(&s->pb, 1, 0); /* no rvlc */ put_bits(&s->pb, 1, 0); /* no rvlc */
}
if (vo_ver_id != 1){ if (vo_ver_id != 1) {
put_bits(&s->pb, 1, 0); /* newpred */ put_bits(&s->pb, 1, 0); /* newpred */
put_bits(&s->pb, 1, 0); /* reduced res vop */ put_bits(&s->pb, 1, 0); /* reduced res vop */
} }
...@@ -1033,7 +1078,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n ...@@ -1033,7 +1078,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
ff_mpeg4_stuffing(&s->pb); ff_mpeg4_stuffing(&s->pb);
/* user data */ /* user data */
if(!(s->flags & CODEC_FLAG_BITEXACT)){ if (!(s->flags & CODEC_FLAG_BITEXACT)) {
put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0);
put_bits(&s->pb, 16, 0x1B2); /* user_data */ put_bits(&s->pb, 16, 0x1B2); /* user_data */
avpriv_put_string(&s->pb, LIBAVCODEC_IDENT, 0); avpriv_put_string(&s->pb, LIBAVCODEC_IDENT, 0);
...@@ -1041,33 +1086,33 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n ...@@ -1041,33 +1086,33 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
} }
/* write mpeg4 VOP header */ /* write mpeg4 VOP header */
void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number)
{ {
int time_incr; int time_incr;
int time_div, time_mod; int time_div, time_mod;
if(s->pict_type==AV_PICTURE_TYPE_I){ if (s->pict_type == AV_PICTURE_TYPE_I) {
if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){ if (!(s->flags & CODEC_FLAG_GLOBAL_HEADER)) {
if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy if (s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) // HACK, the reference sw is buggy
mpeg4_encode_visual_object_header(s); mpeg4_encode_visual_object_header(s);
if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number==0) //HACK, the reference sw is buggy if (s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number == 0) // HACK, the reference sw is buggy
mpeg4_encode_vol_header(s, 0, 0); mpeg4_encode_vol_header(s, 0, 0);
} }
if(!(s->workaround_bugs & FF_BUG_MS)) if (!(s->workaround_bugs & FF_BUG_MS))
mpeg4_encode_gop_header(s); mpeg4_encode_gop_header(s);
} }
s->partitioned_frame= s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_B; s->partitioned_frame = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_B;
put_bits(&s->pb, 16, 0); /* vop header */ put_bits(&s->pb, 16, 0); /* vop header */
put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */ put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */
put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */ put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */
time_div= FFUDIV(s->time, s->avctx->time_base.den); time_div = FFUDIV(s->time, s->avctx->time_base.den);
time_mod= FFUMOD(s->time, s->avctx->time_base.den); time_mod = FFUMOD(s->time, s->avctx->time_base.den);
time_incr= time_div - s->last_time_base; time_incr = time_div - s->last_time_base;
av_assert0(time_incr >= 0); av_assert0(time_incr >= 0);
while(time_incr--) while (time_incr--)
put_bits(&s->pb, 1, 1); put_bits(&s->pb, 1, 1);
put_bits(&s->pb, 1, 0); put_bits(&s->pb, 1, 0);
...@@ -1076,16 +1121,16 @@ void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) ...@@ -1076,16 +1121,16 @@ void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */ 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); /* marker */
put_bits(&s->pb, 1, 1); /* vop coded */ put_bits(&s->pb, 1, 1); /* vop coded */
if ( s->pict_type == AV_PICTURE_TYPE_P if (s->pict_type == AV_PICTURE_TYPE_P ||
|| (s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE)) { (s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage == GMC_SPRITE)) {
put_bits(&s->pb, 1, s->no_rounding); /* rounding type */ put_bits(&s->pb, 1, s->no_rounding); /* rounding type */
} }
put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */ put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */
if(!s->progressive_sequence){ if (!s->progressive_sequence) {
put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first); put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first);
put_bits(&s->pb, 1, s->alternate_scan); put_bits(&s->pb, 1, s->alternate_scan);
} }
//FIXME sprite stuff // FIXME sprite stuff
put_bits(&s->pb, 5, s->qscale); put_bits(&s->pb, 5, s->qscale);
...@@ -1095,12 +1140,11 @@ void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) ...@@ -1095,12 +1140,11 @@ void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 3, s->b_code); /* fcode_back */ put_bits(&s->pb, 3, s->b_code); /* fcode_back */
} }
static av_cold void init_uni_dc_tab(void) static av_cold void init_uni_dc_tab(void)
{ {
int level, uni_code, uni_len; int level, uni_code, uni_len;
for(level=-256; level<256; level++){ for (level = -256; level < 256; level++) {
int size, v, l; int size, v, l;
/* find number of bits */ /* find number of bits */
size = 0; size = 0;
...@@ -1111,40 +1155,43 @@ static av_cold void init_uni_dc_tab(void) ...@@ -1111,40 +1155,43 @@ static av_cold void init_uni_dc_tab(void)
} }
if (level < 0) if (level < 0)
l= (-level) ^ ((1 << size) - 1); l = (-level) ^ ((1 << size) - 1);
else else
l= level; l = level;
/* luminance */ /* luminance */
uni_code= ff_mpeg4_DCtab_lum[size][0]; uni_code = ff_mpeg4_DCtab_lum[size][0];
uni_len = ff_mpeg4_DCtab_lum[size][1]; uni_len = ff_mpeg4_DCtab_lum[size][1];
if (size > 0) { if (size > 0) {
uni_code<<=size; uni_code|=l; uni_code <<= size;
uni_len+=size; uni_code |= l;
if (size > 8){ uni_len += size;
uni_code<<=1; uni_code|=1; if (size > 8) {
uni_code <<= 1;
uni_code |= 1;
uni_len++; uni_len++;
} }
} }
uni_DCtab_lum_bits[level+256]= uni_code; uni_DCtab_lum_bits[level + 256] = uni_code;
uni_DCtab_lum_len [level+256]= uni_len; uni_DCtab_lum_len[level + 256] = uni_len;
/* chrominance */ /* chrominance */
uni_code= ff_mpeg4_DCtab_chrom[size][0]; uni_code = ff_mpeg4_DCtab_chrom[size][0];
uni_len = ff_mpeg4_DCtab_chrom[size][1]; uni_len = ff_mpeg4_DCtab_chrom[size][1];
if (size > 0) { if (size > 0) {
uni_code<<=size; uni_code|=l; uni_code <<= size;
uni_len+=size; uni_code |= l;
if (size > 8){ uni_len += size;
uni_code<<=1; uni_code|=1; if (size > 8) {
uni_code <<= 1;
uni_code |= 1;
uni_len++; uni_len++;
} }
} }
uni_DCtab_chrom_bits[level+256]= uni_code; uni_DCtab_chrom_bits[level + 256] = uni_code;
uni_DCtab_chrom_len [level+256]= uni_len; uni_DCtab_chrom_len[level + 256] = uni_len;
} }
} }
...@@ -1156,75 +1203,87 @@ static av_cold void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, ...@@ -1156,75 +1203,87 @@ static av_cold void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab,
av_assert0(MAX_LEVEL >= 64); av_assert0(MAX_LEVEL >= 64);
av_assert0(MAX_RUN >= 63); av_assert0(MAX_RUN >= 63);
for(slevel=-64; slevel<64; slevel++){ for (slevel = -64; slevel < 64; slevel++) {
if(slevel==0) continue; if (slevel == 0)
for(run=0; run<64; run++){ continue;
for(last=0; last<=1; last++){ for (run = 0; run < 64; run++) {
const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64); for (last = 0; last <= 1; last++) {
int level= slevel < 0 ? -slevel : slevel; const int index = UNI_MPEG4_ENC_INDEX(last, run, slevel + 64);
int sign= slevel < 0 ? 1 : 0; int level = slevel < 0 ? -slevel : slevel;
int sign = slevel < 0 ? 1 : 0;
int bits, len, code; int bits, len, code;
int level1, run1; int level1, run1;
len_tab[index]= 100; len_tab[index] = 100;
/* ESC0 */ /* ESC0 */
code= get_rl_index(rl, last, run, level); code = get_rl_index(rl, last, run, level);
bits= rl->table_vlc[code][0]; bits = rl->table_vlc[code][0];
len= rl->table_vlc[code][1]; len = rl->table_vlc[code][1];
bits=bits*2+sign; len++; bits = bits * 2 + sign;
len++;
if(code!=rl->n && len < len_tab[index]){ if (code != rl->n && len < len_tab[index]) {
bits_tab[index]= bits; bits_tab[index] = bits;
len_tab [index]= len; len_tab[index] = len;
} }
/* ESC1 */ /* ESC1 */
bits= rl->table_vlc[rl->n][0]; bits = rl->table_vlc[rl->n][0];
len= rl->table_vlc[rl->n][1]; len = rl->table_vlc[rl->n][1];
bits=bits*2; len++; //esc1 bits = bits * 2;
level1= level - rl->max_level[last][run]; len++; // esc1
if(level1>0){ level1 = level - rl->max_level[last][run];
code= get_rl_index(rl, last, run, level1); if (level1 > 0) {
bits<<= rl->table_vlc[code][1]; code = get_rl_index(rl, last, run, level1);
bits <<= rl->table_vlc[code][1];
len += rl->table_vlc[code][1]; len += rl->table_vlc[code][1];
bits += rl->table_vlc[code][0]; bits += rl->table_vlc[code][0];
bits=bits*2+sign; len++; bits = bits * 2 + sign;
len++;
if(code!=rl->n && len < len_tab[index]){ if (code != rl->n && len < len_tab[index]) {
bits_tab[index]= bits; bits_tab[index] = bits;
len_tab [index]= len; len_tab[index] = len;
} }
} }
/* ESC2 */ /* ESC2 */
bits= rl->table_vlc[rl->n][0]; bits = rl->table_vlc[rl->n][0];
len= rl->table_vlc[rl->n][1]; 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; run1 = run - rl->max_run[last][level] - 1;
if(run1>=0){ if (run1 >= 0) {
code= get_rl_index(rl, last, run1, level); code = get_rl_index(rl, last, run1, level);
bits<<= rl->table_vlc[code][1]; bits <<= rl->table_vlc[code][1];
len += rl->table_vlc[code][1]; len += rl->table_vlc[code][1];
bits += rl->table_vlc[code][0]; bits += rl->table_vlc[code][0];
bits=bits*2+sign; len++; bits = bits * 2 + sign;
len++;
if(code!=rl->n && len < len_tab[index]){ if (code != rl->n && len < len_tab[index]) {
bits_tab[index]= bits; bits_tab[index] = bits;
len_tab [index]= len; len_tab[index] = len;
} }
} }
/* ESC3 */ /* ESC3 */
bits= rl->table_vlc[rl->n][0]; bits = rl->table_vlc[rl->n][0];
len = rl->table_vlc[rl->n][1]; len = rl->table_vlc[rl->n][1];
bits=bits*4+3; len+=2; //esc3 bits = bits * 4 + 3;
bits=bits*2+last; len++; len += 2; // esc3
bits=bits*64+run; len+=6; bits = bits * 2 + last;
bits=bits*2+1; len++; //marker len++;
bits=bits*4096+(slevel&0xfff); len+=12; bits = bits * 64 + run;
bits=bits*2+1; len++; //marker len += 6;
bits = bits * 2 + 1;
len++; // marker
bits = bits * 4096 + (slevel & 0xfff);
len += 12;
bits = bits * 2 + 1;
len++; // marker
if(len < len_tab[index]){ if (len < len_tab[index]) {
bits_tab[index]= bits; bits_tab[index] = bits;
len_tab [index]= len; len_tab[index] = len;
} }
} }
} }
...@@ -1242,7 +1301,7 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -1242,7 +1301,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if((ret=ff_MPV_encode_init(avctx)) < 0) if ((ret = ff_MPV_encode_init(avctx)) < 0)
return ret; return ret;
if (!done) { if (!done) {
...@@ -1256,81 +1315,79 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -1256,81 +1315,79 @@ static av_cold int encode_init(AVCodecContext *avctx)
init_uni_mpeg4_rl_tab(&ff_h263_rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len); init_uni_mpeg4_rl_tab(&ff_h263_rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len);
} }
s->min_qcoeff= -2048; s->min_qcoeff = -2048;
s->max_qcoeff= 2047; s->max_qcoeff = 2047;
s->intra_ac_vlc_length = uni_mpeg4_intra_rl_len; s->intra_ac_vlc_length = uni_mpeg4_intra_rl_len;
s->intra_ac_vlc_last_length= uni_mpeg4_intra_rl_len + 128*64; s->intra_ac_vlc_last_length = uni_mpeg4_intra_rl_len + 128 * 64;
s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len; s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len;
s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64; s->inter_ac_vlc_last_length = uni_mpeg4_inter_rl_len + 128 * 64;
s->luma_dc_vlc_length= uni_DCtab_lum_len; s->luma_dc_vlc_length = uni_DCtab_lum_len;
s->ac_esc_length= 7+2+1+6+1+12+1; s->ac_esc_length = 7 + 2 + 1 + 6 + 1 + 12 + 1;
s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; s->y_dc_scale_table = ff_mpeg4_y_dc_scale_table;
s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; s->c_dc_scale_table = ff_mpeg4_c_dc_scale_table;
if(s->flags & CODEC_FLAG_GLOBAL_HEADER){ if (s->flags & CODEC_FLAG_GLOBAL_HEADER) {
s->avctx->extradata = av_malloc(1024);
s->avctx->extradata= av_malloc(1024);
init_put_bits(&s->pb, s->avctx->extradata, 1024); init_put_bits(&s->pb, s->avctx->extradata, 1024);
if(!(s->workaround_bugs & FF_BUG_MS)) if (!(s->workaround_bugs & FF_BUG_MS))
mpeg4_encode_visual_object_header(s); mpeg4_encode_visual_object_header(s);
mpeg4_encode_vol_header(s, 0, 0); mpeg4_encode_vol_header(s, 0, 0);
// ff_mpeg4_stuffing(&s->pb); ? // ff_mpeg4_stuffing(&s->pb); ?
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
s->avctx->extradata_size= (put_bits_count(&s->pb)+7)>>3; s->avctx->extradata_size = (put_bits_count(&s->pb) + 7) >> 3;
} }
return 0; return 0;
} }
void ff_mpeg4_init_partitions(MpegEncContext *s) void ff_mpeg4_init_partitions(MpegEncContext *s)
{ {
uint8_t *start= put_bits_ptr(&s->pb); uint8_t *start = put_bits_ptr(&s->pb);
uint8_t *end= s->pb.buf_end; uint8_t *end = s->pb.buf_end;
int size= end - start; int size = end - start;
int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start; int pb_size = (((intptr_t)start + size / 3) & (~3)) - (intptr_t)start;
int tex_size= (size - 2*pb_size)&(~3); int tex_size = (size - 2 * pb_size) & (~3);
set_put_bits_buffer_size(&s->pb, pb_size); set_put_bits_buffer_size(&s->pb, pb_size);
init_put_bits(&s->tex_pb, start + pb_size , tex_size); init_put_bits(&s->tex_pb, start + pb_size, tex_size);
init_put_bits(&s->pb2 , start + pb_size + tex_size, pb_size); init_put_bits(&s->pb2, start + pb_size + tex_size, pb_size);
} }
void ff_mpeg4_merge_partitions(MpegEncContext *s) void ff_mpeg4_merge_partitions(MpegEncContext *s)
{ {
const int pb2_len = put_bits_count(&s->pb2 ); const int pb2_len = put_bits_count(&s->pb2);
const int tex_pb_len= put_bits_count(&s->tex_pb); const int tex_pb_len = put_bits_count(&s->tex_pb);
const int bits= put_bits_count(&s->pb); const int bits = put_bits_count(&s->pb);
if(s->pict_type==AV_PICTURE_TYPE_I){ if (s->pict_type == AV_PICTURE_TYPE_I) {
put_bits(&s->pb, 19, DC_MARKER); put_bits(&s->pb, 19, DC_MARKER);
s->misc_bits+=19 + pb2_len + bits - s->last_bits; s->misc_bits += 19 + pb2_len + bits - s->last_bits;
s->i_tex_bits+= tex_pb_len; s->i_tex_bits += tex_pb_len;
}else{ } else {
put_bits(&s->pb, 17, MOTION_MARKER); put_bits(&s->pb, 17, MOTION_MARKER);
s->misc_bits+=17 + pb2_len; s->misc_bits += 17 + pb2_len;
s->mv_bits+= bits - s->last_bits; s->mv_bits += bits - s->last_bits;
s->p_tex_bits+= tex_pb_len; s->p_tex_bits += tex_pb_len;
} }
flush_put_bits(&s->pb2); flush_put_bits(&s->pb2);
flush_put_bits(&s->tex_pb); flush_put_bits(&s->tex_pb);
set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf); set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf);
avpriv_copy_bits(&s->pb, s->pb2.buf , pb2_len); avpriv_copy_bits(&s->pb, s->pb2.buf, pb2_len);
avpriv_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len); avpriv_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len);
s->last_bits= put_bits_count(&s->pb); s->last_bits = put_bits_count(&s->pb);
} }
void ff_mpeg4_encode_video_packet_header(MpegEncContext *s) void ff_mpeg4_encode_video_packet_header(MpegEncContext *s)
{ {
int mb_num_bits= av_log2(s->mb_num - 1) + 1; int mb_num_bits = av_log2(s->mb_num - 1) + 1;
put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0); put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0);
put_bits(&s->pb, 1, 1); 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, mb_num_bits, s->mb_x + s->mb_y * s->mb_width);
put_bits(&s->pb, s->quant_precision, s->qscale); put_bits(&s->pb, s->quant_precision, s->qscale);
put_bits(&s->pb, 1, 0); /* no HEC */ put_bits(&s->pb, 1, 0); /* no HEC */
} }
...@@ -1360,7 +1417,7 @@ AVCodec ff_mpeg4_encoder = { ...@@ -1360,7 +1417,7 @@ AVCodec ff_mpeg4_encoder = {
.init = encode_init, .init = encode_init,
.encode2 = ff_MPV_encode_picture, .encode2 = ff_MPV_encode_picture,
.close = ff_MPV_encode_end, .close = ff_MPV_encode_end,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
.priv_class = &mpeg4enc_class, .priv_class = &mpeg4enc_class,
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment