diff options
| author | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
|---|---|---|
| committer | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
| commit | a9b7bf3fb3e1334d8defd05ca4cfae870b4912e5 (patch) | |
| tree | 2dab453d94d5e003379a6cc895eceb84c80e23ec /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c | |
| parent | aafd49a91f7c2fa9c7103971c16fa6e1b29e8bfd (diff) | |
astyle formatting cleanup to make the sourcecode more accessible
switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1783 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c | 2001 |
1 files changed, 1194 insertions, 807 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c index 9837ffcb4..5b1121529 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c @@ -52,18 +52,18 @@ #define MB_BTYPE_VLC_BITS 6
static inline int mpeg1_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n);
+ DCTELEM *block,
+ int n);
static inline int mpeg1_decode_block_inter(MpegEncContext *s,
- DCTELEM *block,
- int n);
+ DCTELEM *block,
+ int n);
static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *block,
- int n);
+ DCTELEM *block,
+ int n);
static inline int mpeg2_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n);
+ DCTELEM *block,
+ int n);
static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
@@ -87,44 +87,56 @@ static void init_2d_vlc_rl(RLTable *rl) {
int i;
- for(i=0; i<rl->vlc.table_size; i++){
- int code= rl->vlc.table[i][0];
+ for(i = 0; i < rl->vlc.table_size; i++)
+ {
+ int code = rl->vlc.table[i][0];
int len = rl->vlc.table[i][1];
int level, run;
- if(len==0){ // illegal code
- run= 65;
- level= MAX_LEVEL;
- }else if(len<0){ //more bits needed
- run= 0;
- level= code;
- }else{
- if(code==rl->n){ //esc
- run= 65;
- level= 0;
- }else if(code==rl->n+1){ //eob
- run= 0;
- level= 127;
- }else{
- run= rl->table_run [code] + 1;
- level= rl->table_level[code];
+ if(len == 0) // illegal code
+ {
+ run = 65;
+ level = MAX_LEVEL;
+ }
+ else if(len < 0) //more bits needed
+ {
+ run = 0;
+ level = code;
+ }
+ else
+ {
+ if(code == rl->n) //esc
+ {
+ run = 65;
+ level = 0;
+ }
+ else if(code == rl->n + 1) //eob
+ {
+ run = 0;
+ level = 127;
+ }
+ else
+ {
+ run = rl->table_run [code] + 1;
+ level = rl->table_level[code];
}
}
- rl->rl_vlc[0][i].len= len;
- rl->rl_vlc[0][i].level= level;
- rl->rl_vlc[0][i].run= run;
+ rl->rl_vlc[0][i].len = len;
+ rl->rl_vlc[0][i].level = level;
+ rl->rl_vlc[0][i].run = run;
}
}
void ff_mpeg12_common_init(MpegEncContext *s)
{
- s->y_dc_scale_table=
- s->c_dc_scale_table= mpeg2_dc_scale_table[s->intra_dc_precision];
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = mpeg2_dc_scale_table[s->intra_dc_precision];
}
-void ff_mpeg1_clean_buffers(MpegEncContext *s){
+void ff_mpeg1_clean_buffers(MpegEncContext *s)
+{
s->last_dc[0] = 1 << (7 + s->intra_dc_precision);
s->last_dc[1] = s->last_dc[0];
s->last_dc[2] = s->last_dc[0];
@@ -145,31 +157,32 @@ av_cold void ff_mpeg12_init_vlcs(void) {
static int done = 0;
- if (!done) {
+ if(!done)
+ {
done = 1;
INIT_VLC_STATIC(&dc_lum_vlc, DC_VLC_BITS, 12,
- ff_mpeg12_vlc_dc_lum_bits, 1, 1,
- ff_mpeg12_vlc_dc_lum_code, 2, 2, 512);
+ ff_mpeg12_vlc_dc_lum_bits, 1, 1,
+ ff_mpeg12_vlc_dc_lum_code, 2, 2, 512);
INIT_VLC_STATIC(&dc_chroma_vlc, DC_VLC_BITS, 12,
- ff_mpeg12_vlc_dc_chroma_bits, 1, 1,
- ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514);
+ ff_mpeg12_vlc_dc_chroma_bits, 1, 1,
+ ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514);
INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 17,
- &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1,
- &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 518);
+ &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1,
+ &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 518);
INIT_VLC_STATIC(&mbincr_vlc, MBINCR_VLC_BITS, 36,
- &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1,
- &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538);
+ &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1,
+ &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538);
INIT_VLC_STATIC(&mb_pat_vlc, MB_PAT_VLC_BITS, 64,
- &ff_mpeg12_mbPatTable[0][1], 2, 1,
- &ff_mpeg12_mbPatTable[0][0], 2, 1, 512);
+ &ff_mpeg12_mbPatTable[0][1], 2, 1,
+ &ff_mpeg12_mbPatTable[0][0], 2, 1, 512);
INIT_VLC_STATIC(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7,
- &table_mb_ptype[0][1], 2, 1,
- &table_mb_ptype[0][0], 2, 1, 64);
+ &table_mb_ptype[0][1], 2, 1,
+ &table_mb_ptype[0][0], 2, 1, 64);
INIT_VLC_STATIC(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11,
- &table_mb_btype[0][1], 2, 1,
- &table_mb_btype[0][0], 2, 1, 64);
+ &table_mb_btype[0][1], 2, 1,
+ &table_mb_btype[0][0], 2, 1, 64);
init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
@@ -189,9 +202,12 @@ static inline int get_dmv(MpegEncContext *s) static inline int get_qscale(MpegEncContext *s)
{
int qscale = get_bits(&s->gb, 5);
- if (s->q_scale_type) {
+ if(s->q_scale_type)
+ {
return non_linear_qscale[qscale];
- } else {
+ }
+ else
+ {
return qscale << 1;
}
}
@@ -206,53 +222,63 @@ static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64])
{
int i, j, k, cbp, val, mb_type, motion_type;
- const int mb_block_count = 4 + (1<< s->chroma_format);
+ const int mb_block_count = 4 + (1 << s->chroma_format);
dprintf(s->avctx, "decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
- assert(s->mb_skipped==0);
+ assert(s->mb_skipped == 0);
- if (s->mb_skip_run-- != 0) {
- if (s->pict_type == FF_P_TYPE) {
+ if(s->mb_skip_run-- != 0)
+ {
+ if(s->pict_type == FF_P_TYPE)
+ {
s->mb_skipped = 1;
- s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
- } else {
+ s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ] = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
+ }
+ else
+ {
int mb_type;
if(s->mb_x)
- mb_type= s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1];
+ mb_type = s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1];
else
- mb_type= s->current_picture.mb_type[ s->mb_width + (s->mb_y-1)*s->mb_stride - 1]; // FIXME not sure if this is allowed in MPEG at all
+ mb_type = s->current_picture.mb_type[ s->mb_width + (s->mb_y-1)*s->mb_stride - 1]; // FIXME not sure if this is allowed in MPEG at all
if(IS_INTRA(mb_type))
return -1;
- s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]=
+ s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ] =
mb_type | MB_TYPE_SKIP;
// assert(s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]&(MB_TYPE_16x16|MB_TYPE_16x8));
- if((s->mv[0][0][0]|s->mv[0][0][1]|s->mv[1][0][0]|s->mv[1][0][1])==0)
+ if((s->mv[0][0][0] | s->mv[0][0][1] | s->mv[1][0][0] | s->mv[1][0][1]) == 0)
s->mb_skipped = 1;
}
return 0;
}
- switch(s->pict_type) {
+ switch(s->pict_type)
+ {
default:
case FF_I_TYPE:
- if (get_bits1(&s->gb) == 0) {
- if (get_bits1(&s->gb) == 0){
+ if(get_bits1(&s->gb) == 0)
+ {
+ if(get_bits1(&s->gb) == 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA;
- } else {
+ }
+ else
+ {
mb_type = MB_TYPE_INTRA;
}
break;
case FF_P_TYPE:
mb_type = get_vlc2(&s->gb, mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1);
- if (mb_type < 0){
+ if(mb_type < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
@@ -260,7 +286,8 @@ static int mpeg_decode_mb(MpegEncContext *s, break;
case FF_B_TYPE:
mb_type = get_vlc2(&s->gb, mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1);
- if (mb_type < 0){
+ if(mb_type < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
@@ -269,70 +296,90 @@ static int mpeg_decode_mb(MpegEncContext *s, }
dprintf(s->avctx, "mb_type=%x\n", mb_type);
// motion_type = 0; /* avoid warning */
- if (IS_INTRA(mb_type)) {
+ if(IS_INTRA(mb_type))
+ {
s->dsp.clear_blocks(s->block[0]);
- if(!s->chroma_y_shift){
+ if(!s->chroma_y_shift)
+ {
s->dsp.clear_blocks(s->block[6]);
}
/* compute DCT type */
- if (s->picture_structure == PICT_FRAME && //FIXME add an interlaced_dct coded var?
- !s->frame_pred_frame_dct) {
+ if(s->picture_structure == PICT_FRAME && //FIXME add an interlaced_dct coded var?
+ !s->frame_pred_frame_dct)
+ {
s->interlaced_dct = get_bits1(&s->gb);
}
- if (IS_QUANT(mb_type))
+ if(IS_QUANT(mb_type))
s->qscale = get_qscale(s);
- if (s->concealment_motion_vectors) {
+ if(s->concealment_motion_vectors)
+ {
/* just parse them */
- if (s->picture_structure != PICT_FRAME)
+ if(s->picture_structure != PICT_FRAME)
skip_bits1(&s->gb); /* field select */
- s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] =
- mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]);
- s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] =
- mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]);
+ s->mv[0][0][0] = s->last_mv[0][0][0] = s->last_mv[0][1][0] =
+ mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]);
+ s->mv[0][0][1] = s->last_mv[0][0][1] = s->last_mv[0][1][1] =
+ mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]);
skip_bits1(&s->gb); /* marker */
- }else
+ }
+ else
memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
s->mb_intra = 1;
- if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
- if(s->flags2 & CODEC_FLAG2_FAST){
- for(i=0;i<6;i++) {
+ if(s->codec_id == CODEC_ID_MPEG2VIDEO)
+ {
+ if(s->flags2 & CODEC_FLAG2_FAST)
+ {
+ for(i = 0; i < 6; i++)
+ {
mpeg2_fast_decode_block_intra(s, *s->pblocks[i], i);
}
- }else{
- for(i=0;i<mb_block_count;i++) {
- if (mpeg2_decode_block_intra(s, *s->pblocks[i], i) < 0)
+ }
+ else
+ {
+ for(i = 0; i < mb_block_count; i++)
+ {
+ if(mpeg2_decode_block_intra(s, *s->pblocks[i], i) < 0)
return -1;
}
}
- } else {
- for(i=0;i<6;i++) {
- if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
+ }
+ else
+ {
+ for(i = 0; i < 6; i++)
+ {
+ if(mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
return -1;
}
}
- } else {
- if (mb_type & MB_TYPE_ZERO_MV){
+ }
+ else
+ {
+ if(mb_type & MB_TYPE_ZERO_MV)
+ {
assert(mb_type & MB_TYPE_CBP);
s->mv_dir = MV_DIR_FORWARD;
- if(s->picture_structure == PICT_FRAME){
+ if(s->picture_structure == PICT_FRAME)
+ {
if(!s->frame_pred_frame_dct)
s->interlaced_dct = get_bits1(&s->gb);
s->mv_type = MV_TYPE_16X16;
- }else{
+ }
+ else
+ {
s->mv_type = MV_TYPE_FIELD;
mb_type |= MB_TYPE_INTERLACED;
- s->field_select[0][0]= s->picture_structure - 1;
+ s->field_select[0][0] = s->picture_structure - 1;
}
- if (IS_QUANT(mb_type))
+ if(IS_QUANT(mb_type))
s->qscale = get_qscale(s);
s->last_mv[0][0][0] = 0;
@@ -341,52 +388,66 @@ static int mpeg_decode_mb(MpegEncContext *s, s->last_mv[0][1][1] = 0;
s->mv[0][0][0] = 0;
s->mv[0][0][1] = 0;
- }else{
+ }
+ else
+ {
assert(mb_type & MB_TYPE_L0L1);
//FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED
/* get additional motion vector type */
- if (s->frame_pred_frame_dct)
+ if(s->frame_pred_frame_dct)
motion_type = MT_FRAME;
- else{
+ else
+ {
motion_type = get_bits(&s->gb, 2);
- if (s->picture_structure == PICT_FRAME && HAS_CBP(mb_type))
+ if(s->picture_structure == PICT_FRAME && HAS_CBP(mb_type))
s->interlaced_dct = get_bits1(&s->gb);
}
- if (IS_QUANT(mb_type))
+ if(IS_QUANT(mb_type))
s->qscale = get_qscale(s);
/* motion vectors */
- s->mv_dir= (mb_type>>13)&3;
+ s->mv_dir = (mb_type >> 13) & 3;
dprintf(s->avctx, "motion_type=%d\n", motion_type);
- switch(motion_type) {
+ switch(motion_type)
+ {
case MT_FRAME: /* or MT_16X8 */
- if (s->picture_structure == PICT_FRAME) {
+ if(s->picture_structure == PICT_FRAME)
+ {
mb_type |= MB_TYPE_16x16;
s->mv_type = MV_TYPE_16X16;
- for(i=0;i<2;i++) {
- if (USES_LIST(mb_type, i)) {
+ for(i = 0; i < 2; i++)
+ {
+ if(USES_LIST(mb_type, i))
+ {
/* MT_FRAME */
- s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] =
- mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]);
- s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] =
- mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]);
+ s->mv[i][0][0] = s->last_mv[i][0][0] = s->last_mv[i][1][0] =
+ mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]);
+ s->mv[i][0][1] = s->last_mv[i][0][1] = s->last_mv[i][1][1] =
+ mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]);
/* full_pel: only for MPEG-1 */
- if (s->full_pel[i]){
+ if(s->full_pel[i])
+ {
s->mv[i][0][0] <<= 1;
s->mv[i][0][1] <<= 1;
}
}
}
- } else {
+ }
+ else
+ {
mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
s->mv_type = MV_TYPE_16X8;
- for(i=0;i<2;i++) {
- if (USES_LIST(mb_type, i)) {
+ for(i = 0; i < 2; i++)
+ {
+ if(USES_LIST(mb_type, i))
+ {
/* MT_16X8 */
- for(j=0;j<2;j++) {
+ for(j = 0; j < 2; j++)
+ {
s->field_select[i][j] = get_bits1(&s->gb);
- for(k=0;k<2;k++) {
+ for(k = 0; k < 2; k++)
+ {
val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
s->last_mv[i][j][k]);
s->last_mv[i][j][k] = val;
@@ -399,11 +460,15 @@ static int mpeg_decode_mb(MpegEncContext *s, break;
case MT_FIELD:
s->mv_type = MV_TYPE_FIELD;
- if (s->picture_structure == PICT_FRAME) {
+ if(s->picture_structure == PICT_FRAME)
+ {
mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
- for(i=0;i<2;i++) {
- if (USES_LIST(mb_type, i)) {
- for(j=0;j<2;j++) {
+ for(i = 0; i < 2; i++)
+ {
+ if(USES_LIST(mb_type, i))
+ {
+ for(j = 0; j < 2; j++)
+ {
s->field_select[i][j] = get_bits1(&s->gb);
val = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
s->last_mv[i][j][0]);
@@ -418,12 +483,17 @@ static int mpeg_decode_mb(MpegEncContext *s, }
}
}
- } else {
+ }
+ else
+ {
mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
- for(i=0;i<2;i++) {
- if (USES_LIST(mb_type, i)) {
+ for(i = 0; i < 2; i++)
+ {
+ if(USES_LIST(mb_type, i))
+ {
s->field_select[i][0] = get_bits1(&s->gb);
- for(k=0;k<2;k++) {
+ for(k = 0; k < 2; k++)
+ {
val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
s->last_mv[i][0][k]);
s->last_mv[i][0][k] = val;
@@ -436,10 +506,12 @@ static int mpeg_decode_mb(MpegEncContext *s, break;
case MT_DMV:
s->mv_type = MV_TYPE_DMV;
- for(i=0;i<2;i++) {
- if (USES_LIST(mb_type, i)) {
+ for(i = 0; i < 2; i++)
+ {
+ if(USES_LIST(mb_type, i))
+ {
int dmx, dmy, mx, my, m;
- const int my_shift= s->picture_structure == PICT_FRAME;
+ const int my_shift = s->picture_structure == PICT_FRAME;
mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
s->last_mv[i][0][0]);
@@ -451,15 +523,16 @@ static int mpeg_decode_mb(MpegEncContext *s, dmy = get_dmv(s);
- s->last_mv[i][0][1] = my<<my_shift;
- s->last_mv[i][1][1] = my<<my_shift;
+ s->last_mv[i][0][1] = my << my_shift;
+ s->last_mv[i][1][1] = my << my_shift;
s->mv[i][0][0] = mx;
s->mv[i][0][1] = my;
s->mv[i][1][0] = mx;//not used
s->mv[i][1][1] = my;//not used
- if (s->picture_structure == PICT_FRAME) {
+ if(s->picture_structure == PICT_FRAME)
+ {
mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
//m = 1 + 2 * s->top_field_first;
@@ -471,7 +544,9 @@ static int mpeg_decode_mb(MpegEncContext *s, m = 4 - m;
s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1;
- } else {
+ }
+ else
+ {
mb_type |= MB_TYPE_16x16;
s->mv[i][2][0] = ((mx + (mx > 0)) >> 1) + dmx;
@@ -491,72 +566,102 @@ static int mpeg_decode_mb(MpegEncContext *s, }
s->mb_intra = 0;
- if (HAS_CBP(mb_type)) {
+ if(HAS_CBP(mb_type))
+ {
s->dsp.clear_blocks(s->block[0]);
cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
- if(mb_block_count > 6){
- cbp<<= mb_block_count-6;
- cbp |= get_bits(&s->gb, mb_block_count-6);
- s->dsp.clear_blocks(s->block[6]);
+ if(mb_block_count > 6)
+ {
+ cbp <<= mb_block_count - 6;
+ cbp |= get_bits(&s->gb, mb_block_count - 6);
+ s->dsp.clear_blocks(s->block[6]);
}
- if (cbp <= 0){
+ if(cbp <= 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
- if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
- if(s->flags2 & CODEC_FLAG2_FAST){
- for(i=0;i<6;i++) {
- if(cbp & 32) {
+ if(s->codec_id == CODEC_ID_MPEG2VIDEO)
+ {
+ if(s->flags2 & CODEC_FLAG2_FAST)
+ {
+ for(i = 0; i < 6; i++)
+ {
+ if(cbp & 32)
+ {
mpeg2_fast_decode_block_non_intra(s, *s->pblocks[i], i);
- } else {
+ }
+ else
+ {
s->block_last_index[i] = -1;
}
- cbp+=cbp;
+ cbp += cbp;
}
- }else{
- cbp<<= 12-mb_block_count;
-
- for(i=0;i<mb_block_count;i++) {
- if ( cbp & (1<<11) ) {
- if (mpeg2_decode_block_non_intra(s, *s->pblocks[i], i) < 0)
+ }
+ else
+ {
+ cbp <<= 12 - mb_block_count;
+
+ for(i = 0; i < mb_block_count; i++)
+ {
+ if(cbp & (1 << 11))
+ {
+ if(mpeg2_decode_block_non_intra(s, *s->pblocks[i], i) < 0)
return -1;
- } else {
+ }
+ else
+ {
s->block_last_index[i] = -1;
}
- cbp+=cbp;
+ cbp += cbp;
}
}
- } else {
- if(s->flags2 & CODEC_FLAG2_FAST){
- for(i=0;i<6;i++) {
- if (cbp & 32) {
+ }
+ else
+ {
+ if(s->flags2 & CODEC_FLAG2_FAST)
+ {
+ for(i = 0; i < 6; i++)
+ {
+ if(cbp & 32)
+ {
mpeg1_fast_decode_block_inter(s, *s->pblocks[i], i);
- } else {
+ }
+ else
+ {
s->block_last_index[i] = -1;
}
- cbp+=cbp;
+ cbp += cbp;
}
- }else{
- for(i=0;i<6;i++) {
- if (cbp & 32) {
- if (mpeg1_decode_block_inter(s, *s->pblocks[i], i) < 0)
+ }
+ else
+ {
+ for(i = 0; i < 6; i++)
+ {
+ if(cbp & 32)
+ {
+ if(mpeg1_decode_block_inter(s, *s->pblocks[i], i) < 0)
return -1;
- } else {
+ }
+ else
+ {
s->block_last_index[i] = -1;
}
- cbp+=cbp;
+ cbp += cbp;
}
}
}
- }else{
- for(i=0;i<12;i++)
+ }
+ else
+ {
+ for(i = 0; i < 12; i++)
s->block_last_index[i] = -1;
}
}
- s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= mb_type;
+ s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ] = mb_type;
return 0;
}
@@ -567,92 +672,112 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) int code, sign, val, l, shift;
code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2);
- if (code == 0) {
+ if(code == 0)
+ {
return pred;
}
- if (code < 0) {
+ if(code < 0)
+ {
return 0xffff;
}
sign = get_bits1(&s->gb);
shift = fcode - 1;
val = code;
- if (shift) {
+ if(shift)
+ {
val = (val - 1) << shift;
val |= get_bits(&s->gb, shift);
val++;
}
- if (sign)
+ if(sign)
val = -val;
val += pred;
/* modulo decoding */
- l= INT_BIT - 5 - shift;
- val = (val<<l)>>l;
+ l = INT_BIT - 5 - shift;
+ val = (val << l)>>l;
return val;
}
static inline int mpeg1_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
+ DCTELEM *block,
+ int n)
{
int level, dc, diff, i, j, run;
int component;
RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable= s->intra_scantable.permutated;
- const uint16_t *quant_matrix= s->intra_matrix;
- const int qscale= s->qscale;
+ uint8_t * const scantable = s->intra_scantable.permutated;
+ const uint16_t *quant_matrix = s->intra_matrix;
+ const int qscale = s->qscale;
/* DC coefficient */
component = (n <= 3 ? 0 : n - 4 + 1);
diff = decode_dc(&s->gb, component);
- if (diff >= 0xffff)
+ if(diff >= 0xffff)
return -1;
dc = s->last_dc[component];
dc += diff;
s->last_dc[component] = dc;
- block[0] = dc*quant_matrix[0];
+ block[0] = dc * quant_matrix[0];
dprintf(s->avctx, "dc=%d diff=%d\n", dc, diff);
i = 0;
{
OPEN_READER(re, &s->gb);
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level == 127){
+ if(level == 127)
+ {
break;
- } else if(level != 0) {
+ }
+ else if(level != 0)
+ {
i += run;
j = scantable[i];
- level= (level*qscale*quant_matrix[j])>>4;
- level= (level-1)|1;
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
LAST_SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
- if (level == -128) {
- level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);
- } else if (level == 0) {
- level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
+ level = SHOW_SBITS(re, &s->gb, 8);
+ SKIP_BITS(re, &s->gb, 8);
+ if(level == -128)
+ {
+ level = SHOW_UBITS(re, &s->gb, 8) - 256;
+ LAST_SKIP_BITS(re, &s->gb, 8);
+ }
+ else if(level == 0)
+ {
+ level = SHOW_UBITS(re, &s->gb, 8) ;
+ LAST_SKIP_BITS(re, &s->gb, 8);
}
i += run;
j = scantable[i];
- if(level<0){
- level= -level;
- level= (level*qscale*quant_matrix[j])>>4;
- level= (level-1)|1;
- level= -level;
- }else{
- level= (level*qscale*quant_matrix[j])>>4;
- level= (level-1)|1;
+ if(level < 0)
+ {
+ level = -level;
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
+ level = -level;
+ }
+ else
+ {
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
}
}
- if (i > 63){
+ if(i > 63)
+ {
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
@@ -662,7 +787,7 @@ static inline int mpeg1_decode_block_intra(MpegEncContext *s, CLOSE_READER(re, &s->gb);
}
s->block_last_index[n] = i;
- return 0;
+ return 0;
}
int ff_mpeg1_decode_block_intra(MpegEncContext *s,
@@ -673,25 +798,26 @@ int ff_mpeg1_decode_block_intra(MpegEncContext *s, }
static inline int mpeg1_decode_block_inter(MpegEncContext *s,
- DCTELEM *block,
- int n)
+ DCTELEM *block,
+ int n)
{
int level, i, j, run;
RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable= s->intra_scantable.permutated;
- const uint16_t *quant_matrix= s->inter_matrix;
- const int qscale= s->qscale;
+ uint8_t * const scantable = s->intra_scantable.permutated;
+ const uint16_t *quant_matrix = s->inter_matrix;
+ const int qscale = s->qscale;
{
OPEN_READER(re, &s->gb);
i = -1;
// special case for first coefficient, no need to add second VLC table
UPDATE_CACHE(re, &s->gb);
- if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
- level= (3*qscale*quant_matrix[0])>>5;
- level= (level-1)|1;
- if(GET_CACHE(re, &s->gb)&0x40000000)
- level= -level;
+ if(((int32_t)GET_CACHE(re, &s->gb)) < 0)
+ {
+ level = (3 * qscale * quant_matrix[0]) >> 5;
+ level = (level - 1) | 1;
+ if(GET_CACHE(re, &s->gb) & 0x40000000)
+ level = -level;
block[0] = level;
i++;
SKIP_BITS(re, &s->gb, 2);
@@ -700,39 +826,54 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, }
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level != 0) {
+ if(level != 0)
+ {
i += run;
j = scantable[i];
- level= ((level*2+1)*qscale*quant_matrix[j])>>5;
- level= (level-1)|1;
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = (level - 1) | 1;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
- if (level == -128) {
- level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8);
- } else if (level == 0) {
- level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8);
+ level = SHOW_SBITS(re, &s->gb, 8);
+ SKIP_BITS(re, &s->gb, 8);
+ if(level == -128)
+ {
+ level = SHOW_UBITS(re, &s->gb, 8) - 256;
+ SKIP_BITS(re, &s->gb, 8);
+ }
+ else if(level == 0)
+ {
+ level = SHOW_UBITS(re, &s->gb, 8) ;
+ SKIP_BITS(re, &s->gb, 8);
}
i += run;
j = scantable[i];
- if(level<0){
- level= -level;
- level= ((level*2+1)*qscale*quant_matrix[j])>>5;
- level= (level-1)|1;
- level= -level;
- }else{
- level= ((level*2+1)*qscale*quant_matrix[j])>>5;
- level= (level-1)|1;
+ if(level < 0)
+ {
+ level = -level;
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = (level - 1) | 1;
+ level = -level;
+ }
+ else
+ {
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = (level - 1) | 1;
}
}
- if (i > 63){
+ if(i > 63)
+ {
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
@@ -754,19 +895,20 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *bloc {
int level, i, j, run;
RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable= s->intra_scantable.permutated;
- const int qscale= s->qscale;
+ uint8_t * const scantable = s->intra_scantable.permutated;
+ const int qscale = s->qscale;
{
OPEN_READER(re, &s->gb);
i = -1;
// special case for first coefficient, no need to add second VLC table
UPDATE_CACHE(re, &s->gb);
- if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
- level= (3*qscale)>>1;
- level= (level-1)|1;
- if(GET_CACHE(re, &s->gb)&0x40000000)
- level= -level;
+ if(((int32_t)GET_CACHE(re, &s->gb)) < 0)
+ {
+ level = (3 * qscale) >> 1;
+ level = (level - 1) | 1;
+ if(GET_CACHE(re, &s->gb) & 0x40000000)
+ level = -level;
block[0] = level;
i++;
SKIP_BITS(re, &s->gb, 2);
@@ -775,36 +917,50 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *bloc }
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level != 0) {
+ if(level != 0)
+ {
i += run;
j = scantable[i];
- level= ((level*2+1)*qscale)>>1;
- level= (level-1)|1;
+ level = ((level * 2 + 1) * qscale) >> 1;
+ level = (level - 1) | 1;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
- if (level == -128) {
- level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8);
- } else if (level == 0) {
- level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8);
+ level = SHOW_SBITS(re, &s->gb, 8);
+ SKIP_BITS(re, &s->gb, 8);
+ if(level == -128)
+ {
+ level = SHOW_UBITS(re, &s->gb, 8) - 256;
+ SKIP_BITS(re, &s->gb, 8);
+ }
+ else if(level == 0)
+ {
+ level = SHOW_UBITS(re, &s->gb, 8) ;
+ SKIP_BITS(re, &s->gb, 8);
}
i += run;
j = scantable[i];
- if(level<0){
- level= -level;
- level= ((level*2+1)*qscale)>>1;
- level= (level-1)|1;
- level= -level;
- }else{
- level= ((level*2+1)*qscale)>>1;
- level= (level-1)|1;
+ if(level < 0)
+ {
+ level = -level;
+ level = ((level * 2 + 1) * qscale) >> 1;
+ level = (level - 1) | 1;
+ level = -level;
+ }
+ else
+ {
+ level = ((level * 2 + 1) * qscale) >> 1;
+ level = (level - 1) | 1;
}
}
@@ -823,14 +979,14 @@ end: static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
+ DCTELEM *block,
+ int n)
{
int level, i, j, run;
RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable= s->intra_scantable.permutated;
+ uint8_t * const scantable = s->intra_scantable.permutated;
const uint16_t *quant_matrix;
- const int qscale= s->qscale;
+ const int qscale = s->qscale;
int mismatch;
mismatch = 1;
@@ -838,17 +994,18 @@ static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, {
OPEN_READER(re, &s->gb);
i = -1;
- if (n < 4)
+ if(n < 4)
quant_matrix = s->inter_matrix;
else
quant_matrix = s->chroma_inter_matrix;
// special case for first coefficient, no need to add second VLC table
UPDATE_CACHE(re, &s->gb);
- if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
- level= (3*qscale*quant_matrix[0])>>5;
- if(GET_CACHE(re, &s->gb)&0x40000000)
- level= -level;
+ if(((int32_t)GET_CACHE(re, &s->gb)) < 0)
+ {
+ level = (3 * qscale * quant_matrix[0]) >> 5;
+ if(GET_CACHE(re, &s->gb) & 0x40000000)
+ level = -level;
block[0] = level;
mismatch ^= level;
i++;
@@ -858,31 +1015,41 @@ static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, }
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level != 0) {
+ if(level != 0)
+ {
i += run;
j = scantable[i];
- level= ((level*2+1)*qscale*quant_matrix[j])>>5;
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+ level = SHOW_SBITS(re, &s->gb, 12);
+ SKIP_BITS(re, &s->gb, 12);
i += run;
j = scantable[i];
- if(level<0){
- level= ((-level*2+1)*qscale*quant_matrix[j])>>5;
- level= -level;
- }else{
- level= ((level*2+1)*qscale*quant_matrix[j])>>5;
+ if(level < 0)
+ {
+ level = ((-level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = -level;
+ }
+ else
+ {
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
}
}
- if (i > 63){
+ if(i > 63)
+ {
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
@@ -904,22 +1071,23 @@ end: }
static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
+ DCTELEM *block,
+ int n)
{
int level, i, j, run;
RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable= s->intra_scantable.permutated;
- const int qscale= s->qscale;
+ uint8_t * const scantable = s->intra_scantable.permutated;
+ const int qscale = s->qscale;
OPEN_READER(re, &s->gb);
i = -1;
// special case for first coefficient, no need to add second VLC table
UPDATE_CACHE(re, &s->gb);
- if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
- level= (3*qscale)>>1;
- if(GET_CACHE(re, &s->gb)&0x40000000)
- level= -level;
+ if(((int32_t)GET_CACHE(re, &s->gb)) < 0)
+ {
+ level = (3 * qscale) >> 1;
+ if(GET_CACHE(re, &s->gb) & 0x40000000)
+ level = -level;
block[0] = level;
i++;
SKIP_BITS(re, &s->gb, 2);
@@ -928,28 +1096,37 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, }
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level != 0) {
+ if(level != 0)
+ {
i += run;
j = scantable[i];
- level= ((level*2+1)*qscale)>>1;
+ level = ((level * 2 + 1) * qscale) >> 1;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+ level = SHOW_SBITS(re, &s->gb, 12);
+ SKIP_BITS(re, &s->gb, 12);
i += run;
j = scantable[i];
- if(level<0){
- level= ((-level*2+1)*qscale)>>1;
- level= -level;
- }else{
- level= ((level*2+1)*qscale)>>1;
+ if(level < 0)
+ {
+ level = ((-level * 2 + 1) * qscale) >> 1;
+ level = -level;
+ }
+ else
+ {
+ level = ((level * 2 + 1) * qscale) >> 1;
}
}
@@ -967,27 +1144,30 @@ end: static inline int mpeg2_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
+ DCTELEM *block,
+ int n)
{
int level, dc, diff, i, j, run;
int component;
RLTable *rl;
- uint8_t * const scantable= s->intra_scantable.permutated;
+ uint8_t * const scantable = s->intra_scantable.permutated;
const uint16_t *quant_matrix;
- const int qscale= s->qscale;
+ const int qscale = s->qscale;
int mismatch;
/* DC coefficient */
- if (n < 4){
+ if(n < 4)
+ {
quant_matrix = s->intra_matrix;
component = 0;
- }else{
+ }
+ else
+ {
quant_matrix = s->chroma_intra_matrix;
- component = (n&1) + 1;
+ component = (n & 1) + 1;
}
diff = decode_dc(&s->gb, component);
- if (diff >= 0xffff)
+ if(diff >= 0xffff)
return -1;
dc = s->last_dc[component];
dc += diff;
@@ -996,7 +1176,7 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, dprintf(s->avctx, "dc=%d\n", block[0]);
mismatch = block[0] ^ 1;
i = 0;
- if (s->intra_vlc_format)
+ if(s->intra_vlc_format)
rl = &ff_rl_mpeg2;
else
rl = &ff_rl_mpeg1;
@@ -1004,75 +1184,90 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, {
OPEN_READER(re, &s->gb);
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level == 127){
+ if(level == 127)
+ {
break;
- } else if(level != 0) {
+ }
+ else if(level != 0)
+ {
i += run;
j = scantable[i];
- level= (level*qscale*quant_matrix[j])>>4;
+ level = (level * qscale * quant_matrix[j]) >> 4;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
LAST_SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+ level = SHOW_SBITS(re, &s->gb, 12);
+ SKIP_BITS(re, &s->gb, 12);
i += run;
j = scantable[i];
- if(level<0){
- level= (-level*qscale*quant_matrix[j])>>4;
- level= -level;
- }else{
- level= (level*qscale*quant_matrix[j])>>4;
+ if(level < 0)
+ {
+ level = (-level * qscale * quant_matrix[j]) >> 4;
+ level = -level;
+ }
+ else
+ {
+ level = (level * qscale * quant_matrix[j]) >> 4;
}
}
- if (i > 63){
+ if(i > 63)
+ {
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
- mismatch^= level;
+ mismatch ^= level;
block[j] = level;
}
CLOSE_READER(re, &s->gb);
}
- block[63]^= mismatch&1;
+ block[63] ^= mismatch & 1;
s->block_last_index[n] = i;
return 0;
}
static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
+ DCTELEM *block,
+ int n)
{
int level, dc, diff, j, run;
int component;
RLTable *rl;
- uint8_t * scantable= s->intra_scantable.permutated;
+ uint8_t * scantable = s->intra_scantable.permutated;
const uint16_t *quant_matrix;
- const int qscale= s->qscale;
+ const int qscale = s->qscale;
/* DC coefficient */
- if (n < 4){
+ if(n < 4)
+ {
quant_matrix = s->intra_matrix;
component = 0;
- }else{
+ }
+ else
+ {
quant_matrix = s->chroma_intra_matrix;
- component = (n&1) + 1;
+ component = (n & 1) + 1;
}
diff = decode_dc(&s->gb, component);
- if (diff >= 0xffff)
+ if(diff >= 0xffff)
return -1;
dc = s->last_dc[component];
dc += diff;
s->last_dc[component] = dc;
block[0] = dc << (3 - s->intra_dc_precision);
- if (s->intra_vlc_format)
+ if(s->intra_vlc_format)
rl = &ff_rl_mpeg2;
else
rl = &ff_rl_mpeg1;
@@ -1080,30 +1275,41 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, {
OPEN_READER(re, &s->gb);
/* now quantify & encode AC coefficients */
- for(;;) {
+ for(;;)
+ {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
- if(level == 127){
+ if(level == 127)
+ {
break;
- } else if(level != 0) {
+ }
+ else if(level != 0)
+ {
scantable += run;
j = *scantable;
- level= (level*qscale*quant_matrix[j])>>4;
+ level = (level * qscale * quant_matrix[j]) >> 4;
level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
LAST_SKIP_BITS(re, &s->gb, 1);
- } else {
+ }
+ else
+ {
/* escape */
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = SHOW_UBITS(re, &s->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &s->gb, 6);
UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+ level = SHOW_SBITS(re, &s->gb, 12);
+ SKIP_BITS(re, &s->gb, 12);
scantable += run;
j = *scantable;
- if(level<0){
- level= (-level*qscale*quant_matrix[j])>>4;
- level= -level;
- }else{
- level= (level*qscale*quant_matrix[j])>>4;
+ if(level < 0)
+ {
+ level = (-level * qscale * quant_matrix[j]) >> 4;
+ level = -level;
+ }
+ else
+ {
+ level = (level * qscale * quant_matrix[j]) >> 4;
}
}
@@ -1116,7 +1322,8 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, return 0;
}
-typedef struct Mpeg1Context {
+typedef struct Mpeg1Context
+{
MpegEncContext mpeg_enc_ctx;
int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
int repeat_field; /* true if we must repeat the field */
@@ -1127,10 +1334,10 @@ typedef struct Mpeg1Context { int save_width, save_height, save_progressive_seq;
AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator
int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
- // ==> Start patch MPC
- DXVA_SliceInfo* pSliceInfo;
- uint8_t* prev_slice;
- // <== End patch MPC
+ // ==> Start patch MPC
+ DXVA_SliceInfo* pSliceInfo;
+ uint8_t* prev_slice;
+ // <== End patch MPC
} Mpeg1Context;
static av_cold int mpeg_decode_init(AVCodecContext *avctx)
@@ -1141,23 +1348,23 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) /* we need some permutation to store matrices,
* until MPV_common_init() sets the real permutation. */
- for(i=0;i<64;i++)
- s2->dsp.idct_permutation[i]=i;
+ for(i = 0; i < 64; i++)
+ s2->dsp.idct_permutation[i] = i;
MPV_decode_defaults(s2);
- s->mpeg_enc_ctx.avctx= avctx;
- s->mpeg_enc_ctx.flags= avctx->flags;
- s->mpeg_enc_ctx.flags2= avctx->flags2;
+ s->mpeg_enc_ctx.avctx = avctx;
+ s->mpeg_enc_ctx.flags = avctx->flags;
+ s->mpeg_enc_ctx.flags2 = avctx->flags2;
ff_mpeg12_common_init(&s->mpeg_enc_ctx);
ff_mpeg12_init_vlcs();
s->mpeg_enc_ctx_allocated = 0;
s->mpeg_enc_ctx.picture_number = 0;
s->repeat_field = 0;
- s->mpeg_enc_ctx.codec_id= avctx->codec->id;
- avctx->color_range= AVCOL_RANGE_MPEG;
- if (avctx->codec->id == CODEC_ID_MPEG1VIDEO)
+ s->mpeg_enc_ctx.codec_id = avctx->codec->id;
+ avctx->color_range = AVCOL_RANGE_MPEG;
+ if(avctx->codec->id == CODEC_ID_MPEG1VIDEO)
avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
else
avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
@@ -1165,55 +1372,60 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) }
static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
- const uint8_t *new_perm){
+ const uint8_t *new_perm)
+{
uint16_t temp_matrix[64];
int i;
- memcpy(temp_matrix,matrix,64*sizeof(uint16_t));
+ memcpy(temp_matrix, matrix, 64 * sizeof(uint16_t));
- for(i=0;i<64;i++){
+ for(i = 0; i < 64; i++)
+ {
matrix[new_perm[i]] = temp_matrix[old_perm[i]];
}
}
-static enum PixelFormat mpeg_get_pixelformat(AVCodecContext *avctx){
+static enum PixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
+{
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
- if(s->chroma_format < 2)
- return PIX_FMT_YUV420P;
- else if(s->chroma_format == 2)
- return PIX_FMT_YUV422P;
- else
- return PIX_FMT_YUV444P;
+ if(s->chroma_format < 2)
+ return PIX_FMT_YUV420P;
+ else if(s->chroma_format == 2)
+ return PIX_FMT_YUV422P;
+ else
+ return PIX_FMT_YUV444P;
}
/* Call this function when we know all parameters.
* It may be called in different places for MPEG-1 and MPEG-2. */
-static int mpeg_decode_postinit(AVCodecContext *avctx){
+static int mpeg_decode_postinit(AVCodecContext *avctx)
+{
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
uint8_t old_permutation[64];
- if (
- (s1->mpeg_enc_ctx_allocated == 0)||
+ if(
+ (s1->mpeg_enc_ctx_allocated == 0) ||
avctx->coded_width != s->width ||
- avctx->coded_height != s->height||
+ avctx->coded_height != s->height ||
s1->save_width != s->width ||
s1->save_height != s->height ||
- s1->save_aspect_info != s->aspect_ratio_info||
+ s1->save_aspect_info != s->aspect_ratio_info ||
s1->save_progressive_seq != s->progressive_sequence ||
0)
{
- if (s1->mpeg_enc_ctx_allocated) {
- ParseContext pc= s->parse_context;
- s->parse_context.buffer=0;
+ if(s1->mpeg_enc_ctx_allocated)
+ {
+ ParseContext pc = s->parse_context;
+ s->parse_context.buffer = 0;
MPV_common_end(s);
- s->parse_context= pc;
+ s->parse_context = pc;
}
- if( (s->width == 0 )||(s->height == 0))
+ if((s->width == 0) || (s->height == 0))
return -2;
avcodec_set_dimensions(avctx, s->width, s->height);
@@ -1227,27 +1439,31 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ * that behave like P-frames. */
avctx->has_b_frames = !(s->low_delay);
- assert((avctx->sub_id==1) == (avctx->codec_id==CODEC_ID_MPEG1VIDEO));
- if(avctx->codec_id==CODEC_ID_MPEG1VIDEO){
+ assert((avctx->sub_id == 1) == (avctx->codec_id == CODEC_ID_MPEG1VIDEO));
+ if(avctx->codec_id == CODEC_ID_MPEG1VIDEO)
+ {
//MPEG-1 fps
- avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num;
- avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den;
+ avctx->time_base.den = ff_frame_rate_tab[s->frame_rate_index].num;
+ avctx->time_base.num = ff_frame_rate_tab[s->frame_rate_index].den;
//MPEG-1 aspect
- avctx->sample_aspect_ratio= av_d2q(
- 1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255);
+ avctx->sample_aspect_ratio = av_d2q(
+ 1.0 / ff_mpeg1_aspect[s->aspect_ratio_info], 255);
- }else{//MPEG-2
+ }
+ else //MPEG-2
+ {
#if 0 // ffdshow custom code (move this block to mpeg_decode_sequence_extension)
- //MPEG-2 fps
+ //MPEG-2 fps
av_reduce(
&s->avctx->time_base.den,
&s->avctx->time_base.num,
ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num,
ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den,
- 1<<30);
+ 1 << 30);
#endif
- //MPEG-2 aspect
- if(s->aspect_ratio_info > 1){
+ //MPEG-2 aspect
+ if(s->aspect_ratio_info > 1)
+ {
//we ignore the spec here as reality does not match the spec, see for example
// res_change_ffmpeg_aspect.ts and sequence-display-aspect.mpg
@@ -1258,32 +1474,37 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ * wrong spec-value in sample_aspect_ratio2.
* Let ffdshow guess which is likely.
*/
- AVRational r1={s->width, s->height};
- AVRational r2={s1->pan_scan.width, s1->pan_scan.height};
- if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0)){
- s->avctx->sample_aspect_ratio=
- s->avctx->sample_aspect_ratio2=
- av_div_q(
- ff_mpeg2_aspect[s->aspect_ratio_info],
- r1
- );
- }else{
- s->avctx->sample_aspect_ratio=
+ AVRational r1 = {s->width, s->height};
+ AVRational r2 = {s1->pan_scan.width, s1->pan_scan.height};
+ if((s1->pan_scan.width == 0) || (s1->pan_scan.height == 0))
+ {
+ s->avctx->sample_aspect_ratio =
+ s->avctx->sample_aspect_ratio2 =
+ av_div_q(
+ ff_mpeg2_aspect[s->aspect_ratio_info],
+ r1
+ );
+ }
+ else
+ {
+ s->avctx->sample_aspect_ratio =
av_div_q(
- ff_mpeg2_aspect[s->aspect_ratio_info],
- r2
+ ff_mpeg2_aspect[s->aspect_ratio_info],
+ r2
);
- s->avctx->sample_aspect_ratio2=
+ s->avctx->sample_aspect_ratio2 =
// Dity workaround
// This is wrong, but often used. Let ffdshow chose either r2 or r1.
av_div_q(
- ff_mpeg2_aspect[s->aspect_ratio_info],
- r1
+ ff_mpeg2_aspect[s->aspect_ratio_info],
+ r1
);
}
/* ffdshow custom code end */
- }else{
- s->avctx->sample_aspect_ratio=
+ }
+ else
+ {
+ s->avctx->sample_aspect_ratio =
ff_mpeg2_aspect[s->aspect_ratio_info];
}
}//MPEG-2
@@ -1292,15 +1513,15 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ /* Quantization matrices may need reordering
* if DCT permutation is changed. */
- memcpy(old_permutation,s->dsp.idct_permutation,64*sizeof(uint8_t));
+ memcpy(old_permutation, s->dsp.idct_permutation, 64 * sizeof(uint8_t));
- if (MPV_common_init(s) < 0)
+ if(MPV_common_init(s) < 0)
return -2;
- quant_matrix_rebuild(s->intra_matrix, old_permutation,s->dsp.idct_permutation);
- quant_matrix_rebuild(s->inter_matrix, old_permutation,s->dsp.idct_permutation);
- quant_matrix_rebuild(s->chroma_intra_matrix,old_permutation,s->dsp.idct_permutation);
- quant_matrix_rebuild(s->chroma_inter_matrix,old_permutation,s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->intra_matrix, old_permutation, s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->inter_matrix, old_permutation, s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->chroma_intra_matrix, old_permutation, s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->chroma_inter_matrix, old_permutation, s->dsp.idct_permutation);
s1->mpeg_enc_ctx_allocated = 1;
}
@@ -1314,32 +1535,34 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, MpegEncContext *s = &s1->mpeg_enc_ctx;
int ref, f_code, vbv_delay;
- init_get_bits(&s->gb, buf, buf_size*8);
+ init_get_bits(&s->gb, buf, buf_size * 8);
ref = get_bits(&s->gb, 10); /* temporal ref */
s->pict_type = get_bits(&s->gb, 3);
if(s->pict_type == 0 || s->pict_type > 3)
return -1;
- vbv_delay= get_bits(&s->gb, 16);
- if (s->pict_type == FF_P_TYPE || s->pict_type == FF_B_TYPE) {
+ vbv_delay = get_bits(&s->gb, 16);
+ if(s->pict_type == FF_P_TYPE || s->pict_type == FF_B_TYPE)
+ {
s->full_pel[0] = get_bits1(&s->gb);
f_code = get_bits(&s->gb, 3);
- if (f_code == 0 && avctx->error_recognition >= FF_ER_COMPLIANT)
+ if(f_code == 0 && avctx->error_recognition >= FF_ER_COMPLIANT)
return -1;
s->mpeg_f_code[0][0] = f_code;
s->mpeg_f_code[0][1] = f_code;
}
- if (s->pict_type == FF_B_TYPE) {
+ if(s->pict_type == FF_B_TYPE)
+ {
s->full_pel[1] = get_bits1(&s->gb);
f_code = get_bits(&s->gb, 3);
- if (f_code == 0 && avctx->error_recognition >= FF_ER_COMPLIANT)
+ if(f_code == 0 && avctx->error_recognition >= FF_ER_COMPLIANT)
return -1;
s->mpeg_f_code[1][0] = f_code;
s->mpeg_f_code[1][1] = f_code;
}
- s->current_picture.pict_type= s->pict_type;
- s->current_picture.key_frame= s->pict_type == FF_I_TYPE;
+ s->current_picture.pict_type = s->pict_type;
+ s->current_picture.key_frame = s->pict_type == FF_I_TYPE;
if(avctx->debug & FF_DEBUG_PICT_INFO)
av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type);
@@ -1351,13 +1574,13 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
{
- MpegEncContext *s= &s1->mpeg_enc_ctx;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
int horiz_size_ext, vert_size_ext;
int bit_rate_ext;
skip_bits(&s->gb, 1); /* profile and level esc*/
- s->avctx->profile= get_bits(&s->gb, 3);
- s->avctx->level= get_bits(&s->gb, 4);
+ s->avctx->profile = get_bits(&s->gb, 3);
+ s->avctx->level = get_bits(&s->gb, 4);
s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */
s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */
horiz_size_ext = get_bits(&s->gb, 2);
@@ -1367,13 +1590,13 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */
s->bit_rate += (bit_rate_ext << 18) * 400;
skip_bits1(&s->gb); /* marker */
- s->avctx->rc_buffer_size += get_bits(&s->gb, 8)*1024*16<<10;
+ s->avctx->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10;
s->low_delay = get_bits1(&s->gb);
- if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1;
+ if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay = 1;
- s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1;
- s1->frame_rate_ext.den = get_bits(&s->gb, 5)+1;
+ s1->frame_rate_ext.num = get_bits(&s->gb, 2) + 1;
+ s1->frame_rate_ext.den = get_bits(&s->gb, 5) + 1;
// ffdshow custom code begin (moved from mpeg_decode_postinit)
// MPEG-2 fps
av_reduce(
@@ -1381,11 +1604,11 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) &s->avctx->time_base.num,
ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num,
ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den,
- 1<<30);
+ 1 << 30);
// ffdshow custom code end
dprintf(s->avctx, "sequence extension\n");
- s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
+ s->codec_id = s->avctx->codec_id = CODEC_ID_MPEG2VIDEO;
s->avctx->sub_id = 2; /* indicates MPEG-2 found */
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
@@ -1396,23 +1619,24 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
{
- MpegEncContext *s= &s1->mpeg_enc_ctx;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
int color_description, w, h;
skip_bits(&s->gb, 3); /* video format */
- color_description= get_bits1(&s->gb);
- if(color_description){
- s->avctx->color_primaries= get_bits(&s->gb, 8);
+ color_description = get_bits1(&s->gb);
+ if(color_description)
+ {
+ s->avctx->color_primaries = get_bits(&s->gb, 8);
s->avctx->color_trc = get_bits(&s->gb, 8);
s->avctx->colorspace = get_bits(&s->gb, 8);
}
- w= get_bits(&s->gb, 14);
+ w = get_bits(&s->gb, 14);
skip_bits(&s->gb, 1); //marker
- h= get_bits(&s->gb, 14);
+ h = get_bits(&s->gb, 14);
skip_bits(&s->gb, 1); //marker
- s1->pan_scan.width= 16*w;
- s1->pan_scan.height=16*h;
+ s1->pan_scan.width = 16 * w;
+ s1->pan_scan.height = 16 * h;
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
@@ -1420,51 +1644,61 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
{
- MpegEncContext *s= &s1->mpeg_enc_ctx;
- int i,nofco;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+ int i, nofco;
nofco = 1;
- if(s->progressive_sequence){
- if(s->repeat_first_field){
+ if(s->progressive_sequence)
+ {
+ if(s->repeat_first_field)
+ {
nofco++;
if(s->top_field_first)
nofco++;
}
- }else{
- if(s->picture_structure == PICT_FRAME){
+ }
+ else
+ {
+ if(s->picture_structure == PICT_FRAME)
+ {
nofco++;
if(s->repeat_first_field)
nofco++;
}
}
- for(i=0; i<nofco; i++){
- s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16);
+ for(i = 0; i < nofco; i++)
+ {
+ s1->pan_scan.position[i][0] = get_sbits(&s->gb, 16);
skip_bits(&s->gb, 1); //marker
- s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16);
+ s1->pan_scan.position[i][1] = get_sbits(&s->gb, 16);
skip_bits(&s->gb, 1); //marker
}
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n",
- s1->pan_scan.position[0][0], s1->pan_scan.position[0][1],
- s1->pan_scan.position[1][0], s1->pan_scan.position[1][1],
- s1->pan_scan.position[2][0], s1->pan_scan.position[2][1]
- );
+ s1->pan_scan.position[0][0], s1->pan_scan.position[0][1],
+ s1->pan_scan.position[1][0], s1->pan_scan.position[1][1],
+ s1->pan_scan.position[2][0], s1->pan_scan.position[2][1]
+ );
}
-static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], uint16_t matrix1[64], uint16_t matrix2[64], int intra, int ffdshow_custom){
+static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], uint16_t matrix1[64], uint16_t matrix2[64], int intra, int ffdshow_custom)
+{
int i;
- for(i=0; i<64; i++) {
+ for(i = 0; i < 64; i++)
+ {
int j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
int v = get_bits(&s->gb, 8);
- if(v==0){
+ if(v == 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "matrix damaged\n");
return -1;
}
- if(intra && i==0 && v!=8){
+ if(intra && i == 0 && v != 8)
+ {
av_log(s->avctx, AV_LOG_ERROR, "intra matrix invalid, ignoring\n");
- v= 8; // needed by pink.mpg / issue1046
+ v = 8; // needed by pink.mpg / issue1046
}
matrix0[j] = v;
if(matrix1)
@@ -1487,24 +1721,27 @@ static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
{
- MpegEncContext *s= &s1->mpeg_enc_ctx;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
s->full_pel[0] = s->full_pel[1] = 0;
s->mpeg_f_code[0][0] = get_bits(&s->gb, 4);
s->mpeg_f_code[0][1] = get_bits(&s->gb, 4);
s->mpeg_f_code[1][0] = get_bits(&s->gb, 4);
s->mpeg_f_code[1][1] = get_bits(&s->gb, 4);
- if(!s->pict_type && s1->mpeg_enc_ctx_allocated){
+ if(!s->pict_type && s1->mpeg_enc_ctx_allocated)
+ {
av_log(s->avctx, AV_LOG_ERROR, "Missing picture start code, guessing missing values\n");
- if(s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1]==15){
+ if(s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1] == 15)
+ {
if(s->mpeg_f_code[0][0] == 15 && s->mpeg_f_code[0][1] == 15)
- s->pict_type= FF_I_TYPE;
+ s->pict_type = FF_I_TYPE;
else
- s->pict_type= FF_P_TYPE;
- }else
- s->pict_type= FF_B_TYPE;
- s->current_picture.pict_type= s->pict_type;
- s->current_picture.key_frame= s->pict_type == FF_I_TYPE;
+ s->pict_type = FF_P_TYPE;
+ }
+ else
+ s->pict_type = FF_B_TYPE;
+ s->current_picture.pict_type = s->pict_type;
+ s->current_picture.key_frame = s->pict_type == FF_I_TYPE;
}
s->intra_dc_precision = get_bits(&s->gb, 2);
s->picture_structure = get_bits(&s->gb, 2);
@@ -1518,34 +1755,43 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) s->chroma_420_type = get_bits1(&s->gb);
s->progressive_frame = get_bits1(&s->gb);
- if(s->progressive_sequence && !s->progressive_frame){
- s->progressive_frame= 1;
+ if(s->progressive_sequence && !s->progressive_frame)
+ {
+ s->progressive_frame = 1;
av_log(s->avctx, AV_LOG_ERROR, "interlaced frame in progressive sequence, ignoring\n");
}
- if(s->picture_structure==0 || (s->progressive_frame && s->picture_structure!=PICT_FRAME)){
+ if(s->picture_structure == 0 || (s->progressive_frame && s->picture_structure != PICT_FRAME))
+ {
av_log(s->avctx, AV_LOG_ERROR, "picture_structure %d invalid, ignoring\n", s->picture_structure);
- s->picture_structure= PICT_FRAME;
+ s->picture_structure = PICT_FRAME;
}
- if(s->progressive_sequence && !s->frame_pred_frame_dct){
+ if(s->progressive_sequence && !s->frame_pred_frame_dct)
+ {
av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n");
- s->frame_pred_frame_dct= 1;
+ s->frame_pred_frame_dct = 1;
}
- if(s->picture_structure == PICT_FRAME){
- s->first_field=0;
- s->v_edge_pos= 16*s->mb_height;
- }else{
+ if(s->picture_structure == PICT_FRAME)
+ {
+ s->first_field = 0;
+ s->v_edge_pos = 16 * s->mb_height;
+ }
+ else
+ {
s->first_field ^= 1;
- s->v_edge_pos= 8*s->mb_height;
- memset(s->mbskip_table, 0, s->mb_stride*s->mb_height);
+ s->v_edge_pos = 8 * s->mb_height;
+ memset(s->mbskip_table, 0, s->mb_stride * s->mb_height);
}
- if(s->alternate_scan){
+ if(s->alternate_scan)
+ {
ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan);
ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan);
- }else{
+ }
+ else
+ {
ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
}
@@ -1562,20 +1808,23 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) dprintf(s->avctx, "progressive_frame=%d\n", s->progressive_frame);
}
-static void exchange_uv(MpegEncContext *s){
- DCTELEM (*tmp)[64];
+static void exchange_uv(MpegEncContext *s)
+{
+ DCTELEM(*tmp)[64];
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
}
-static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size){
- AVCodecContext *avctx= s->avctx;
+static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
+{
+ AVCodecContext *avctx = s->avctx;
Mpeg1Context *s1 = (Mpeg1Context*)s;
/* start frame decoding */
- if(s->first_field || s->picture_structure==PICT_FRAME){
+ if(s->first_field || s->picture_structure == PICT_FRAME)
+ {
if(MPV_frame_start(s, avctx) < 0)
return -1;
@@ -1584,32 +1833,41 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) /* first check if we must repeat the frame */
s->current_picture_ptr->repeat_pict = 0;
- if (s->repeat_first_field) {
- if (s->progressive_sequence) {
- if (s->top_field_first)
+ if(s->repeat_first_field)
+ {
+ if(s->progressive_sequence)
+ {
+ if(s->top_field_first)
s->current_picture_ptr->repeat_pict = 4;
else
s->current_picture_ptr->repeat_pict = 2;
- } else if (s->progressive_frame) {
+ }
+ else if(s->progressive_frame)
+ {
s->current_picture_ptr->repeat_pict = 1;
}
}
- *s->current_picture_ptr->pan_scan= s1->pan_scan;
- }else{ //second field
- int i;
+ *s->current_picture_ptr->pan_scan = s1->pan_scan;
+ }
+ else //second field
+ {
+ int i;
- if(!s->current_picture_ptr){
- av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
- return -1;
- }
+ if(!s->current_picture_ptr)
+ {
+ av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
+ return -1;
+ }
- for(i=0; i<4; i++){
- s->current_picture.data[i] = s->current_picture_ptr->data[i];
- if(s->picture_structure == PICT_BOTTOM_FIELD){
- s->current_picture.data[i] += s->current_picture_ptr->linesize[i];
- }
+ for(i = 0; i < 4; i++)
+ {
+ s->current_picture.data[i] = s->current_picture_ptr->data[i];
+ if(s->picture_structure == PICT_BOTTOM_FIELD)
+ {
+ s->current_picture.data[i] += s->current_picture_ptr->linesize[i];
}
+ }
}
return 0;
@@ -1627,124 +1885,147 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, const uint8_t **buf, int buf_size)
{
MpegEncContext *s = &s1->mpeg_enc_ctx;
- AVCodecContext *avctx= s->avctx;
- const int field_pic= s->picture_structure != PICT_FRAME;
- const int lowres= s->avctx->lowres;
+ AVCodecContext *avctx = s->avctx;
+ const int field_pic = s->picture_structure != PICT_FRAME;
+ const int lowres = s->avctx->lowres;
- s->resync_mb_x=
- s->resync_mb_y= -1;
+ s->resync_mb_x =
+ s->resync_mb_y = -1;
assert(mb_y < s->mb_height);
- init_get_bits(&s->gb, *buf, buf_size*8);
+ init_get_bits(&s->gb, *buf, buf_size * 8);
ff_mpeg1_clean_buffers(s);
s->interlaced_dct = 0;
- // ==> Start patch MPC
- // DXVA need raw syntax element
- if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- s->qscale = get_bits(&s->gb, 5);
- else
- s->qscale = get_qscale(s);
- // <== End patch MPC
+ // ==> Start patch MPC
+ // DXVA need raw syntax element
+ if(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ s->qscale = get_bits(&s->gb, 5);
+ else
+ s->qscale = get_qscale(s);
+ // <== End patch MPC
- if(s->qscale == 0){
+ if(s->qscale == 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n");
return -1;
}
/* extra slice info */
- while (get_bits1(&s->gb) != 0) {
+ while(get_bits1(&s->gb) != 0)
+ {
skip_bits(&s->gb, 8);
}
- // ==> Start patch MPC
- if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- {
- // Fill DXVA structure and return
- // s1->pSliceInfo[s1->slice_count].wHorizontalPosition = // TODO : horizontal ?
- s1->pSliceInfo[s1->slice_count].wVerticalPosition = s1->slice_count;
- s1->pSliceInfo[s1->slice_count].wMBbitOffset = s->gb.index + 32; // Current pos + Slice Start Code
- s1->pSliceInfo[s1->slice_count].wNumberMBsInSlice = s->mb_width;
- s1->pSliceInfo[s1->slice_count].wQuantizerScaleCode = s->qscale;// >> 1;
- s1->pSliceInfo[s1->slice_count].dwSliceBitsInBuffer = (buf_size*8)+32;
-
- if (s1->slice_count>0)
- {
- s1->pSliceInfo[s1->slice_count-1].dwSliceBitsInBuffer = (*buf - s1->prev_slice)*8;
- s1->pSliceInfo[s1->slice_count].dwSliceDataLocation = s1->pSliceInfo[s1->slice_count-1].dwSliceDataLocation +
- s1->pSliceInfo[s1->slice_count-1].dwSliceBitsInBuffer/8;
- }
+ // ==> Start patch MPC
+ if(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ {
+ // Fill DXVA structure and return
+ // s1->pSliceInfo[s1->slice_count].wHorizontalPosition = // TODO : horizontal ?
+ s1->pSliceInfo[s1->slice_count].wVerticalPosition = s1->slice_count;
+ s1->pSliceInfo[s1->slice_count].wMBbitOffset = s->gb.index + 32; // Current pos + Slice Start Code
+ s1->pSliceInfo[s1->slice_count].wNumberMBsInSlice = s->mb_width;
+ s1->pSliceInfo[s1->slice_count].wQuantizerScaleCode = s->qscale;// >> 1;
+ s1->pSliceInfo[s1->slice_count].dwSliceBitsInBuffer = (buf_size * 8) + 32;
+
+ if(s1->slice_count > 0)
+ {
+ s1->pSliceInfo[s1->slice_count-1].dwSliceBitsInBuffer = (*buf - s1->prev_slice) * 8;
+ s1->pSliceInfo[s1->slice_count].dwSliceDataLocation = s1->pSliceInfo[s1->slice_count-1].dwSliceDataLocation +
+ s1->pSliceInfo[s1->slice_count-1].dwSliceBitsInBuffer / 8;
+ }
- s1->prev_slice = (uint8_t*)*buf;
- s1->slice_count++;
+ s1->prev_slice = (uint8_t*) * buf;
+ s1->slice_count++;
- return 0;
- }
- // <== End patch MPC
+ return 0;
+ }
+ // <== End patch MPC
- s->mb_x=0;
+ s->mb_x = 0;
- if(mb_y==0 && s->codec_tag == AV_RL32("SLIF")){
+ if(mb_y == 0 && s->codec_tag == AV_RL32("SLIF"))
+ {
skip_bits1(&s->gb);
- }else{
- for(;;) {
+ }
+ else
+ {
+ for(;;)
+ {
int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
- if (code < 0){
+ if(code < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n");
return -1;
}
- if (code >= 33) {
- if (code == 33) {
+ if(code >= 33)
+ {
+ if(code == 33)
+ {
s->mb_x += 33;
}
/* otherwise, stuffing, nothing to do */
- } else {
+ }
+ else
+ {
s->mb_x += code;
break;
}
}
}
- if(s->mb_x >= (unsigned)s->mb_width){
+ if(s->mb_x >= (unsigned)s->mb_width)
+ {
av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n");
return -1;
}
- s->resync_mb_x= s->mb_x;
- s->resync_mb_y= s->mb_y= mb_y;
- s->mb_skip_run= 0;
+ s->resync_mb_x = s->mb_x;
+ s->resync_mb_y = s->mb_y = mb_y;
+ s->mb_skip_run = 0;
ff_init_block_index(s);
- if (s->mb_y==0 && s->mb_x==0 && (s->first_field || s->picture_structure==PICT_FRAME)) {
- if(s->avctx->debug&FF_DEBUG_PICT_INFO){
- av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n",
- s->qscale, s->mpeg_f_code[0][0],s->mpeg_f_code[0][1],s->mpeg_f_code[1][0],s->mpeg_f_code[1][1],
- s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")),
- s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"",
- s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
- s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :"");
+ if(s->mb_y == 0 && s->mb_x == 0 && (s->first_field || s->picture_structure == PICT_FRAME))
+ {
+ if(s->avctx->debug & FF_DEBUG_PICT_INFO)
+ {
+ av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n",
+ s->qscale, s->mpeg_f_code[0][0], s->mpeg_f_code[0][1], s->mpeg_f_code[1][0], s->mpeg_f_code[1][1],
+ s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")),
+ s->progressive_sequence ? "ps" : "", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" : "", s->top_field_first ? "top" : "",
+ s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
+ s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" : "");
}
}
- for(;;) {
+ for(;;)
+ {
if(mpeg_decode_mb(s, s->block) < 0)
return -1;
- if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs
+ if(s->current_picture.motion_val[0] && !s->encoding) //note motion_val is normally NULL unless we want to extract the MVs
+ {
const int wrap = s->b8_stride;
- int xy = s->mb_x*2 + s->mb_y*2*wrap;
+ int xy = s->mb_x * 2 + s->mb_y * 2 * wrap;
int motion_x, motion_y, dir, i;
- for(i=0; i<2; i++){
- for(dir=0; dir<2; dir++){
- if (s->mb_intra || (dir==1 && s->pict_type != FF_B_TYPE)) {
+ for(i = 0; i < 2; i++)
+ {
+ for(dir = 0; dir < 2; dir++)
+ {
+ if(s->mb_intra || (dir == 1 && s->pict_type != FF_B_TYPE))
+ {
motion_x = motion_y = 0;
- }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){
+ }
+ else if(s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic))
+ {
motion_x = s->mv[dir][0][0];
motion_y = s->mv[dir][0][1];
- } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ {
+ }
+ else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/
+ {
motion_x = s->mv[dir][i][0];
motion_y = s->mv[dir][i][1];
}
@@ -1753,39 +2034,43 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, s->current_picture.motion_val[dir][xy ][1] = motion_y;
s->current_picture.motion_val[dir][xy + 1][0] = motion_x;
s->current_picture.motion_val[dir][xy + 1][1] = motion_y;
- s->current_picture.ref_index [dir][xy ]=
- s->current_picture.ref_index [dir][xy + 1]= s->field_select[dir][i];
- assert(s->field_select[dir][i]==0 || s->field_select[dir][i]==1);
+ s->current_picture.ref_index [dir][xy ] =
+ s->current_picture.ref_index [dir][xy + 1] = s->field_select[dir][i];
+ assert(s->field_select[dir][i] == 0 || s->field_select[dir][i] == 1);
}
xy += wrap;
}
}
s->dest[0] += 16 >> lowres;
- s->dest[1] +=(16 >> lowres) >> s->chroma_x_shift;
- s->dest[2] +=(16 >> lowres) >> s->chroma_x_shift;
+ s->dest[1] += (16 >> lowres) >> s->chroma_x_shift;
+ s->dest[2] += (16 >> lowres) >> s->chroma_x_shift;
MPV_decode_mb(s, s->block);
- if (++s->mb_x >= s->mb_width) {
- const int mb_size= 16>>s->avctx->lowres;
+ if(++s->mb_x >= s->mb_width)
+ {
+ const int mb_size = 16 >> s->avctx->lowres;
- ff_draw_horiz_band(s, mb_size*(s->mb_y>>field_pic), mb_size);
+ ff_draw_horiz_band(s, mb_size*(s->mb_y >> field_pic), mb_size);
s->mb_x = 0;
- s->mb_y += 1<<field_pic;
+ s->mb_y += 1 << field_pic;
- if(s->mb_y >= s->mb_height){
- int left= get_bits_left(&s->gb);
- int is_d10= s->chroma_format==2 && s->pict_type==FF_I_TYPE && avctx->profile==0 && avctx->level==5
- && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0
- && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/;
+ if(s->mb_y >= s->mb_height)
+ {
+ int left = get_bits_left(&s->gb);
+ int is_d10 = s->chroma_format == 2 && s->pict_type == FF_I_TYPE && avctx->profile == 0 && avctx->level == 5
+ && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0
+ && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/;
if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10)
- || (avctx->error_recognition >= FF_ER_AGGRESSIVE && left>8)){
+ || (avctx->error_recognition >= FF_ER_AGGRESSIVE && left > 8))
+ {
av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23)));
return -1;
- }else
+ }
+ else
goto eos;
}
@@ -1793,54 +2078,69 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, }
/* skip mb handling */
- if (s->mb_skip_run == -1) {
+ if(s->mb_skip_run == -1)
+ {
/* read increment again */
s->mb_skip_run = 0;
- for(;;) {
+ for(;;)
+ {
int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
- if (code < 0){
+ if(code < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n");
return -1;
}
- if (code >= 33) {
- if (code == 33) {
+ if(code >= 33)
+ {
+ if(code == 33)
+ {
s->mb_skip_run += 33;
- }else if(code == 35){
- if(s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0){
+ }
+ else if(code == 35)
+ {
+ if(s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n");
return -1;
}
goto eos; /* end of slice */
}
/* otherwise, stuffing, nothing to do */
- } else {
+ }
+ else
+ {
s->mb_skip_run += code;
break;
}
}
- if(s->mb_skip_run){
+ if(s->mb_skip_run)
+ {
int i;
- if(s->pict_type == FF_I_TYPE){
+ if(s->pict_type == FF_I_TYPE)
+ {
av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y);
return -1;
}
/* skip mb */
s->mb_intra = 0;
- for(i=0;i<12;i++)
+ for(i = 0; i < 12; i++)
s->block_last_index[i] = -1;
if(s->picture_structure == PICT_FRAME)
s->mv_type = MV_TYPE_16X16;
else
s->mv_type = MV_TYPE_FIELD;
- if (s->pict_type == FF_P_TYPE) {
+ if(s->pict_type == FF_P_TYPE)
+ {
/* if P type, zero motion vector is implied */
s->mv_dir = MV_DIR_FORWARD;
s->mv[0][0][0] = s->mv[0][0][1] = 0;
s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0;
s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0;
- s->field_select[0][0]= (s->picture_structure - 1) & 1;
- } else {
+ s->field_select[0][0] = (s->picture_structure - 1) & 1;
+ }
+ else
+ {
/* if B type, reuse previous vectors and directions */
s->mv[0][0][0] = s->last_mv[0][0][0];
s->mv[0][0][1] = s->last_mv[0][0][1];
@@ -1851,40 +2151,45 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, }
}
eos: // end of slice
- *buf += (get_bits_count(&s->gb)-1)/8;
+ *buf += (get_bits_count(&s->gb) - 1) / 8;
//printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
return 0;
}
-static int slice_decode_thread(AVCodecContext *c, void *arg){
- MpegEncContext *s= *(void**)arg;
- const uint8_t *buf= s->gb.buffer;
- int mb_y= s->start_mb_y;
- const int field_pic= s->picture_structure != PICT_FRAME;
+static int slice_decode_thread(AVCodecContext *c, void *arg)
+{
+ MpegEncContext *s = *(void**)arg;
+ const uint8_t *buf = s->gb.buffer;
+ int mb_y = s->start_mb_y;
+ const int field_pic = s->picture_structure != PICT_FRAME;
- s->error_count= (3*(s->end_mb_y - s->start_mb_y)*s->mb_width) >> field_pic;
+ s->error_count = (3 * (s->end_mb_y - s->start_mb_y) * s->mb_width) >> field_pic;
- for(;;){
+ for(;;)
+ {
uint32_t start_code;
int ret;
- ret= mpeg_decode_slice((Mpeg1Context*)s, mb_y, &buf, s->gb.buffer_end - buf);
+ ret = mpeg_decode_slice((Mpeg1Context*)s, mb_y, &buf, s->gb.buffer_end - buf);
emms_c();
//av_log(c, AV_LOG_DEBUG, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n",
//ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, s->start_mb_y, s->end_mb_y, s->error_count);
- if(ret < 0){
- if(s->resync_mb_x>=0 && s->resync_mb_y>=0)
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
- }else{
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
+ if(ret < 0)
+ {
+ if(s->resync_mb_x >= 0 && s->resync_mb_y >= 0)
+ ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, AC_ERROR | DC_ERROR | MV_ERROR);
+ }
+ else
+ {
+ ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1, s->mb_y, AC_END | DC_END | MV_END);
}
if(s->mb_y == s->end_mb_y)
return 0;
- start_code= -1;
+ start_code = -1;
buf = ff_find_start_code(buf, s->gb.buffer_end, &start_code);
- mb_y= start_code - SLICE_MIN_START_CODE;
+ mb_y = start_code - SLICE_MIN_START_CODE;
if(mb_y < 0 || mb_y >= s->end_mb_y)
return -1;
}
@@ -1901,37 +2206,44 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
- if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
+ if(!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
return 0;
/* end of slice reached */
- if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) {
+ if(/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field)
+ {
/* end of image */
- s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2;
+ s->current_picture_ptr->qscale_type = FF_QSCALE_TYPE_MPEG2;
- // ==> Start patch MPC
- if (!s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- ff_er_frame_end(s);
- // <== End patch MPC
+ // ==> Start patch MPC
+ if(!s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ ff_er_frame_end(s);
+ // <== End patch MPC
MPV_frame_end(s);
- if (s->pict_type == FF_B_TYPE || s->low_delay) {
- *pict= *(AVFrame*)s->current_picture_ptr;
+ if(s->pict_type == FF_B_TYPE || s->low_delay)
+ {
+ *pict = *(AVFrame*)s->current_picture_ptr;
ff_print_debug_info(s, pict);
- } else {
+ }
+ else
+ {
s->picture_number++;
/* latency of 1 frame for I- and P-frames */
/* XXX: use another variable than picture_number */
- if (s->last_picture_ptr != NULL) {
- *pict= *(AVFrame*)s->last_picture_ptr;
- ff_print_debug_info(s, pict);
+ if(s->last_picture_ptr != NULL)
+ {
+ *pict = *(AVFrame*)s->last_picture_ptr;
+ ff_print_debug_info(s, pict);
}
}
return 1;
- } else {
+ }
+ else
+ {
return 0;
}
}
@@ -1941,58 +2253,68 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, {
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
- int width,height;
+ int width, height;
int i, v, j;
- init_get_bits(&s->gb, buf, buf_size*8);
+ init_get_bits(&s->gb, buf, buf_size * 8);
width = get_bits(&s->gb, 12);
height = get_bits(&s->gb, 12);
- if (width <= 0 || height <= 0)
+ if(width <= 0 || height <= 0)
return -1;
- s->aspect_ratio_info= get_bits(&s->gb, 4);
- if (s->aspect_ratio_info == 0) {
+ s->aspect_ratio_info = get_bits(&s->gb, 4);
+ if(s->aspect_ratio_info == 0)
+ {
av_log(avctx, AV_LOG_ERROR, "aspect ratio has forbidden 0 value\n");
- if (avctx->error_recognition >= FF_ER_COMPLIANT)
+ if(avctx->error_recognition >= FF_ER_COMPLIANT)
return -1;
}
s->frame_rate_index = get_bits(&s->gb, 4);
- if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
+ if(s->frame_rate_index == 0 || s->frame_rate_index > 13)
return -1;
s->bit_rate = get_bits(&s->gb, 18) * 400;
- if (get_bits1(&s->gb) == 0) /* marker */
+ if(get_bits1(&s->gb) == 0) /* marker */
return -1;
s->width = width;
s->height = height;
- s->avctx->rc_buffer_size= get_bits(&s->gb, 10) * 1024*16;
+ s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16;
skip_bits(&s->gb, 1);
/* get matrix */
- if (get_bits1(&s->gb)) {
+ if(get_bits1(&s->gb))
+ {
load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, s->avctx->intra_matrix, 1, 1);
- } else {
- for(i=0;i<64;i++) {
+ }
+ else
+ {
+ for(i = 0; i < 64; i++)
+ {
j = s->dsp.idct_permutation[i];
v = ff_mpeg1_default_intra_matrix[i];
- s->avctx->intra_matrix[i]=v;
+ s->avctx->intra_matrix[i] = v;
s->intra_matrix[j] = v;
s->chroma_intra_matrix[j] = v;
}
}
- if (get_bits1(&s->gb)) {
+ if(get_bits1(&s->gb))
+ {
load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, s->avctx->inter_matrix, 0, 1);
- } else {
- for(i=0;i<64;i++) {
- int j= s->dsp.idct_permutation[i];
+ }
+ else
+ {
+ for(i = 0; i < 64; i++)
+ {
+ int j = s->dsp.idct_permutation[i];
v = ff_mpeg1_default_non_intra_matrix[i];
- s->avctx->inter_matrix[i]=v;
+ s->avctx->inter_matrix[i] = v;
s->inter_matrix[j] = v;
s->chroma_inter_matrix[j] = v;
}
}
- if(show_bits(&s->gb, 23) != 0){
+ if(show_bits(&s->gb, 23) != 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n");
return -1;
}
@@ -2003,11 +2325,11 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, s->picture_structure = PICT_FRAME;
s->frame_pred_frame_dct = 1;
s->chroma_format = 1;
- s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO;
+ s->codec_id = s->avctx->codec_id = CODEC_ID_MPEG1VIDEO;
avctx->sub_id = 1; /* indicates MPEG-1 */
s->out_format = FMT_MPEG1;
s->swap_uv = 0;//AFAIK VCR2 does not have SEQ_HEADER
- if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1;
+ if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay = 1;
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%d\n",
@@ -2024,24 +2346,26 @@ static int vcr2_init_sequence(AVCodecContext *avctx) /* start new MPEG-1 context decoding */
s->out_format = FMT_MPEG1;
- if (s1->mpeg_enc_ctx_allocated) {
+ if(s1->mpeg_enc_ctx_allocated)
+ {
MPV_common_end(s);
}
s->width = avctx->coded_width;
s->height = avctx->coded_height;
- avctx->has_b_frames= 0; //true?
- s->low_delay= 1;
+ avctx->has_b_frames = 0; //true?
+ s->low_delay = 1;
avctx->pix_fmt = mpeg_get_pixelformat(avctx);
- if (MPV_common_init(s) < 0)
+ if(MPV_common_init(s) < 0)
return -1;
exchange_uv(s);//common init reset pblocks, so we swap them here
s->swap_uv = 1;// in case of xvmc we need to swap uv for each MB
s1->mpeg_enc_ctx_allocated = 1;
- for(i=0;i<64;i++) {
- int j= s->dsp.idct_permutation[i];
+ for(i = 0; i < 64; i++)
+ {
+ int j = s->dsp.idct_permutation[i];
v = ff_mpeg1_default_intra_matrix[i];
s->intra_matrix[j] = v;
s->chroma_intra_matrix[j] = v;
@@ -2056,7 +2380,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) s->picture_structure = PICT_FRAME;
s->frame_pred_frame_dct = 1;
s->chroma_format = 1;
- s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
+ s->codec_id = s->avctx->codec_id = CODEC_ID_MPEG2VIDEO;
avctx->sub_id = 2; /* indicates MPEG-2 */
s1->save_width = s->width;
s1->save_height = s->height;
@@ -2069,25 +2393,29 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, const uint8_t *p, int buf_size)
{
const uint8_t *buf = p;
- const uint8_t *buf_end = p+buf_size;
+ const uint8_t *buf_end = p + buf_size;
/* we parse the DTG active format information */
- if (buf_end - p >= 5 &&
- p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {
+ if(buf_end - p >= 5 &&
+ p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1')
+ {
int flags = p[4];
p += 5;
- if (flags & 0x80) {
+ if(flags & 0x80)
+ {
/* skip event id */
p += 2;
}
- if (flags & 0x40) {
- if (buf_end - p < 1)
+ if(flags & 0x40)
+ {
+ if(buf_end - p < 1)
return;
avctx->dtg_active_format = p[0] & 0x0f;
}
}
/* ffdshow custom code */
- else if (avctx->handle_user_data) {
+ else if(avctx->handle_user_data)
+ {
uint32_t state;
uint8_t *user_data_end = ff_find_start_code(buf, buf + buf_size, &state);
avctx->handle_user_data(avctx, buf, user_data_end - buf);
@@ -2095,7 +2423,8 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, }
static void mpeg_decode_gop(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size){
+ const uint8_t *buf, int buf_size)
+{
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
@@ -2104,15 +2433,15 @@ static void mpeg_decode_gop(AVCodecContext *avctx, int time_code_seconds, time_code_pictures;
int broken_link;
- init_get_bits(&s->gb, buf, buf_size*8);
+ init_get_bits(&s->gb, buf, buf_size * 8);
drop_frame_flag = get_bits1(&s->gb);
- time_code_hours=get_bits(&s->gb,5);
- time_code_minutes = get_bits(&s->gb,6);
+ time_code_hours = get_bits(&s->gb, 5);
+ time_code_minutes = get_bits(&s->gb, 6);
skip_bits1(&s->gb);//marker bit
- time_code_seconds = get_bits(&s->gb,6);
- time_code_pictures = get_bits(&s->gb,6);
+ time_code_seconds = get_bits(&s->gb, 6);
+ time_code_pictures = get_bits(&s->gb, 6);
s->closed_gop = get_bits1(&s->gb);
/*broken_link indicate that after editing the
@@ -2122,8 +2451,8 @@ static void mpeg_decode_gop(AVCodecContext *avctx, if(s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n",
- time_code_hours, time_code_minutes, time_code_seconds,
- time_code_pictures, s->closed_gop, broken_link);
+ time_code_hours, time_code_minutes, time_code_seconds,
+ time_code_pictures, s->closed_gop, broken_link);
}
/**
* Finds the end of the current frame in the bitstream.
@@ -2132,72 +2461,82 @@ static void mpeg_decode_gop(AVCodecContext *avctx, int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s, int64_t *rtStart, AVCodecContext *avctx) /* rtStart,avctx: ffdshow custom code */
{
int i;
- uint32_t state= pc->state;
+ uint32_t state = pc->state;
/* EOF considered as end of frame */
- if (buf_size == 0)
+ if(buf_size == 0)
return 0;
-/*
- 0 frame start -> 1/4
- 1 first_SEQEXT -> 0/2
- 2 first field start -> 3/0
- 3 second_SEQEXT -> 2/0
- 4 searching end
-*/
-
- for(i=0; i<buf_size; i++){
- assert(pc->frame_start_found>=0 && pc->frame_start_found<=4);
- if(pc->frame_start_found&1){
- if(state == EXT_START_CODE && (buf[i]&0xF0) != 0x80)
+ /*
+ 0 frame start -> 1/4
+ 1 first_SEQEXT -> 0/2
+ 2 first field start -> 3/0
+ 3 second_SEQEXT -> 2/0
+ 4 searching end
+ */
+
+ for(i = 0; i < buf_size; i++)
+ {
+ assert(pc->frame_start_found >= 0 && pc->frame_start_found <= 4);
+ if(pc->frame_start_found & 1)
+ {
+ if(state == EXT_START_CODE && (buf[i] & 0xF0) != 0x80)
pc->frame_start_found--;
- else if(state == EXT_START_CODE+2){
- if((buf[i]&3) == 3) pc->frame_start_found= 0;
- else pc->frame_start_found= (pc->frame_start_found+1)&3;
+ else if(state == EXT_START_CODE + 2)
+ {
+ if((buf[i] & 3) == 3) pc->frame_start_found = 0;
+ else pc->frame_start_found = (pc->frame_start_found + 1) & 3;
}
state++;
- }else{
- i= ff_find_start_code(buf+i, buf+buf_size, &state) - buf - 1;
- if(pc->frame_start_found==0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){
+ }
+ else
+ {
+ i = ff_find_start_code(buf + i, buf + buf_size, &state) - buf - 1;
+ if(pc->frame_start_found == 0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE)
+ {
i++;
- pc->frame_start_found=4;
-
- pc->rtStart=*rtStart; /* ffdshow custom code */
- *rtStart=_I64_MIN; /* ffdshow custom code */
+ pc->frame_start_found = 4;
+
+ pc->rtStart = *rtStart; /* ffdshow custom code */
+ *rtStart = _I64_MIN; /* ffdshow custom code */
}
- if(state == SEQ_END_CODE){
- pc->state=-1;
+ if(state == SEQ_END_CODE)
+ {
+ pc->state = -1;
/* ffdshow custom code (i-3 instead of i+1) */
/* DVDs won't send the next frame start on still images */
/* SEQ_END_CODE will have to stay at the beginning of the next frame */
- if (avctx->isDVD)
- return i-3;
+ if(avctx->isDVD)
+ return i - 3;
else
- return i+1;
+ return i + 1;
}
- if(pc->frame_start_found==2 && state == SEQ_START_CODE)
- pc->frame_start_found= 0;
- if(pc->frame_start_found<4 && state == EXT_START_CODE)
+ if(pc->frame_start_found == 2 && state == SEQ_START_CODE)
+ pc->frame_start_found = 0;
+ if(pc->frame_start_found < 4 && state == EXT_START_CODE)
pc->frame_start_found++;
- if(pc->frame_start_found == 4 && (state&0xFFFFFF00) == 0x100){
- if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){
- pc->frame_start_found=0;
- pc->state=-1;
- return i-3;
+ if(pc->frame_start_found == 4 && (state & 0xFFFFFF00) == 0x100)
+ {
+ if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE)
+ {
+ pc->frame_start_found = 0;
+ pc->state = -1;
+ return i - 3;
}
}
- if(s && state == PICTURE_START_CODE){
- ff_fetch_timestamp(s, i-3, 1);
+ if(s && state == PICTURE_START_CODE)
+ {
+ ff_fetch_timestamp(s, i - 3, 1);
}
}
}
- pc->state= state;
+ pc->state = state;
return END_NOT_FOUND;
}
static int decode_chunks(AVCodecContext *avctx,
- AVFrame *picture, int *data_size,
- const uint8_t *buf, int buf_size);
+ AVFrame *picture, int *data_size,
+ const uint8_t *buf, int buf_size);
/* handle buffering and image synchronisation */
static int mpeg_decode_frame(AVCodecContext *avctx,
@@ -2209,11 +2548,13 @@ static int mpeg_decode_frame(AVCodecContext *avctx, MpegEncContext *s2 = &s->mpeg_enc_ctx;
dprintf(avctx, "fill_buffer\n");
- if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == SEQ_END_CODE)) {
+ if(buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == SEQ_END_CODE))
+ {
/* special case for last picture */
- if (s2->low_delay==0 && s2->next_picture_ptr) {
- *picture= *(AVFrame*)s2->next_picture_ptr;
- s2->next_picture_ptr= NULL;
+ if(s2->low_delay == 0 && s2->next_picture_ptr)
+ {
+ *picture = *(AVFrame*)s2->next_picture_ptr;
+ s2->next_picture_ptr = NULL;
picture->mpeg2_sequence_end_flag = 1; /* ffdshow custom code */
*data_size = sizeof(AVFrame);
@@ -2221,29 +2562,32 @@ static int mpeg_decode_frame(AVCodecContext *avctx, return buf_size;
}
- if(s2->flags&CODEC_FLAG_TRUNCATED){
+ if(s2->flags & CODEC_FLAG_TRUNCATED)
+ {
int next = ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size, NULL, avctx->parserRtStart, avctx); /* avctx->parserRtStart: ffdshow custom code */
- if( ff_combine_frame(&s2->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 )
+ if(ff_combine_frame(&s2->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0)
return buf_size;
}
#if 0
- if (s->repeat_field % 2 == 1) {
+ if(s->repeat_field % 2 == 1)
+ {
s->repeat_field++;
//fprintf(stderr,"\nRepeating last frame: %d -> %d! pict: %d %d", avctx->frame_number-1, avctx->frame_number,
// s2->picture_number, s->repeat_field);
- if (avctx->flags & CODEC_FLAG_REPEAT_FIELD) {
+ if(avctx->flags & CODEC_FLAG_REPEAT_FIELD)
+ {
*data_size = sizeof(AVPicture);
goto the_end;
}
}
#endif
- if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == AV_RL32("VCR2"))
+ if(s->mpeg_enc_ctx_allocated == 0 && avctx->codec_tag == AV_RL32("VCR2"))
vcr2_init_sequence(avctx);
- s->slice_count= 0;
+ s->slice_count = 0;
if(avctx->extradata && !avctx->frame_number)
decode_chunks(avctx, picture, data_size, avctx->extradata, avctx->extradata_size);
@@ -2252,82 +2596,100 @@ static int mpeg_decode_frame(AVCodecContext *avctx, }
static int decode_chunks(AVCodecContext *avctx,
- AVFrame *picture, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVFrame *picture, int *data_size,
+ const uint8_t *buf, int buf_size)
{
Mpeg1Context *s = avctx->priv_data;
MpegEncContext *s2 = &s->mpeg_enc_ctx;
const uint8_t *buf_ptr = buf;
const uint8_t *buf_end = buf + buf_size;
int ret, input_size;
- int last_code= 0;
+ int last_code = 0;
- for(;;) {
+ for(;;)
+ {
/* find next start code */
uint32_t start_code = -1;
- buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code);
- if (start_code > 0x1ff){
- if(s2->pict_type != FF_B_TYPE || avctx->skip_frame <= AVDISCARD_DEFAULT){
- if(avctx->thread_count > 1){
+ buf_ptr = ff_find_start_code(buf_ptr, buf_end, &start_code);
+ if(start_code > 0x1ff)
+ {
+ if(s2->pict_type != FF_B_TYPE || avctx->skip_frame <= AVDISCARD_DEFAULT)
+ {
+ if(avctx->thread_count > 1)
+ {
int i;
avctx->execute(avctx, slice_decode_thread, &s2->thread_context[0], NULL, s->slice_count, sizeof(void*));
- for(i=0; i<s->slice_count; i++)
+ for(i = 0; i < s->slice_count; i++)
s2->error_count += s2->thread_context[i]->error_count;
}
- if (slice_end(avctx, picture)) {
+ if(slice_end(avctx, picture))
+ {
if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice
*data_size = sizeof(AVPicture);
}
}
- s2->pict_type= 0;
+ s2->pict_type = 0;
return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
}
input_size = buf_end - buf_ptr;
- if(avctx->debug & FF_DEBUG_STARTCODE){
- av_log(avctx, AV_LOG_DEBUG, "%3X at %td left %d\n", start_code, buf_ptr-buf, input_size);
+ if(avctx->debug & FF_DEBUG_STARTCODE)
+ {
+ av_log(avctx, AV_LOG_DEBUG, "%3X at %td left %d\n", start_code, buf_ptr - buf, input_size);
}
/* prepare data for next start code */
- switch(start_code) {
+ switch(start_code)
+ {
case SEQ_START_CODE:
- if(last_code == 0){
- mpeg1_decode_sequence(avctx, buf_ptr,
- input_size);
- s->sync=1;
- }else{
+ if(last_code == 0)
+ {
+ mpeg1_decode_sequence(avctx, buf_ptr,
+ input_size);
+ s->sync = 1;
+ }
+ else
+ {
av_log(avctx, AV_LOG_ERROR, "ignoring SEQ_START_CODE after %X\n", last_code);
}
break;
case PICTURE_START_CODE:
- if(last_code == 0 || last_code == SLICE_MIN_START_CODE){
- if(mpeg_decode_postinit(avctx) < 0){
- av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n");
- return -1;
- }
+ if(last_code == 0 || last_code == SLICE_MIN_START_CODE)
+ {
+ if(mpeg_decode_postinit(avctx) < 0)
+ {
+ av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n");
+ return -1;
+ }
- /* we have a complete image: we try to decompress it */
- if(mpeg1_decode_picture(avctx,
- buf_ptr, input_size) < 0)
- s2->pict_type=0;
+ /* we have a complete image: we try to decompress it */
+ if(mpeg1_decode_picture(avctx,
+ buf_ptr, input_size) < 0)
+ s2->pict_type = 0;
s2->first_slice = 1;
- last_code= PICTURE_START_CODE;
- }else{
+ last_code = PICTURE_START_CODE;
+ }
+ else
+ {
av_log(avctx, AV_LOG_ERROR, "ignoring pic after %X\n", last_code);
}
break;
case EXT_START_CODE:
- init_get_bits(&s2->gb, buf_ptr, input_size*8);
+ init_get_bits(&s2->gb, buf_ptr, input_size * 8);
- switch(get_bits(&s2->gb, 4)) {
+ switch(get_bits(&s2->gb, 4))
+ {
case 0x1:
- if(last_code == 0){
- mpeg_decode_sequence_extension(s);
- }else{
+ if(last_code == 0)
+ {
+ mpeg_decode_sequence_extension(s);
+ }
+ else
+ {
av_log(avctx, AV_LOG_ERROR, "ignoring seq ext after %X\n", last_code);
}
break;
@@ -2341,9 +2703,12 @@ static int decode_chunks(AVCodecContext *avctx, mpeg_decode_picture_display_extension(s);
break;
case 0x8:
- if(last_code == PICTURE_START_CODE){
- mpeg_decode_picture_coding_extension(s);
- }else{
+ if(last_code == PICTURE_START_CODE)
+ {
+ mpeg_decode_picture_coding_extension(s);
+ }
+ else
+ {
av_log(avctx, AV_LOG_ERROR, "ignoring pic cod ext after %X\n", last_code);
}
break;
@@ -2351,104 +2716,122 @@ static int decode_chunks(AVCodecContext *avctx, break;
case USER_START_CODE:
mpeg_decode_user_data(avctx,
- buf_ptr, input_size);
+ buf_ptr, input_size);
break;
case GOP_START_CODE:
- if(last_code == 0){
- s2->first_field=0;
- mpeg_decode_gop(avctx,
- buf_ptr, input_size);
- s->sync=1;
- }else{
+ if(last_code == 0)
+ {
+ s2->first_field = 0;
+ mpeg_decode_gop(avctx,
+ buf_ptr, input_size);
+ s->sync = 1;
+ }
+ else
+ {
av_log(avctx, AV_LOG_ERROR, "ignoring GOP_START_CODE after %X\n", last_code);
}
break;
default:
- if (start_code >= SLICE_MIN_START_CODE &&
- start_code <= SLICE_MAX_START_CODE && last_code!=0) {
- const int field_pic= s2->picture_structure != PICT_FRAME;
- int mb_y= (start_code - SLICE_MIN_START_CODE) << field_pic;
- last_code= SLICE_MIN_START_CODE;
+ if(start_code >= SLICE_MIN_START_CODE &&
+ start_code <= SLICE_MAX_START_CODE && last_code != 0)
+ {
+ const int field_pic = s2->picture_structure != PICT_FRAME;
+ int mb_y = (start_code - SLICE_MIN_START_CODE) << field_pic;
+ last_code = SLICE_MIN_START_CODE;
if(s2->picture_structure == PICT_BOTTOM_FIELD)
mb_y++;
- if (mb_y >= s2->mb_height){
+ if(mb_y >= s2->mb_height)
+ {
av_log(s2->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s2->mb_height);
return -1;
}
- if(s2->last_picture_ptr==NULL){
- /* Skip B-frames if we do not have reference frames and gop is not closed */
- if(s2->pict_type==FF_B_TYPE){
+ if(s2->last_picture_ptr == NULL)
+ {
+ /* Skip B-frames if we do not have reference frames and gop is not closed */
+ if(s2->pict_type == FF_B_TYPE)
+ {
if(!s2->closed_gop)
break;
}
}
- if(s2->pict_type==FF_I_TYPE)
- s->sync=1;
- if(s2->next_picture_ptr==NULL){
- /* Skip P-frames if we do not have a reference frame or we have an invalid header. */
- if(s2->pict_type==FF_P_TYPE && !s->sync) break;
+ if(s2->pict_type == FF_I_TYPE)
+ s->sync = 1;
+ if(s2->next_picture_ptr == NULL)
+ {
+ /* Skip P-frames if we do not have a reference frame or we have an invalid header. */
+ if(s2->pict_type == FF_P_TYPE && !s->sync) break;
}
/* Skip B-frames if we are in a hurry. */
- if(avctx->hurry_up && s2->pict_type==FF_B_TYPE) break;
- if( (avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type==FF_B_TYPE)
- ||(avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type!=FF_I_TYPE)
- || avctx->skip_frame >= AVDISCARD_ALL)
+ if(avctx->hurry_up && s2->pict_type == FF_B_TYPE) break;
+ if((avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type == FF_B_TYPE)
+ || (avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type != FF_I_TYPE)
+ || avctx->skip_frame >= AVDISCARD_ALL)
break;
/* Skip everything if we are in a hurry>=5. */
- if(avctx->hurry_up>=5) break;
+ if(avctx->hurry_up >= 5) break;
- if (!s->mpeg_enc_ctx_allocated) break;
+ if(!s->mpeg_enc_ctx_allocated) break;
- if(s2->codec_id == CODEC_ID_MPEG2VIDEO){
+ if(s2->codec_id == CODEC_ID_MPEG2VIDEO)
+ {
if(mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom)
break;
}
- if(!s2->pict_type){
+ if(!s2->pict_type)
+ {
av_log(avctx, AV_LOG_ERROR, "Missing picture start code\n");
break;
}
- if(s2->first_slice){
- s2->first_slice=0;
+ if(s2->first_slice)
+ {
+ s2->first_slice = 0;
if(mpeg_field_start(s2, buf, buf_size) < 0)
return -1;
}
- if(!s2->current_picture_ptr){
+ if(!s2->current_picture_ptr)
+ {
av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n");
return -1;
}
- if(avctx->thread_count > 1){
- int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
- if(threshold <= mb_y){
- MpegEncContext *thread_context= s2->thread_context[s->slice_count];
+ if(avctx->thread_count > 1)
+ {
+ int threshold = (s2->mb_height * s->slice_count + avctx->thread_count / 2) / avctx->thread_count;
+ if(threshold <= mb_y)
+ {
+ MpegEncContext *thread_context = s2->thread_context[s->slice_count];
- thread_context->start_mb_y= mb_y;
+ thread_context->start_mb_y = mb_y;
thread_context->end_mb_y = s2->mb_height;
- if(s->slice_count){
- s2->thread_context[s->slice_count-1]->end_mb_y= mb_y;
+ if(s->slice_count)
+ {
+ s2->thread_context[s->slice_count-1]->end_mb_y = mb_y;
ff_update_duplicate_context(thread_context, s2);
}
- init_get_bits(&thread_context->gb, buf_ptr, input_size*8);
+ init_get_bits(&thread_context->gb, buf_ptr, input_size * 8);
s->slice_count++;
}
buf_ptr += 2; //FIXME add minimum number of bytes per slice
- }else{
+ }
+ else
+ {
ret = mpeg_decode_slice(s, mb_y, &buf_ptr, input_size);
emms_c();
- if(ret < 0){
- if(s2->resync_mb_x>=0 && s2->resync_mb_y>=0)
- ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
- // ==> Start patch MPC
- else if (!s2->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- //}else{
- // <== End patch MPC
- ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, AC_END|DC_END|MV_END);
+ if(ret < 0)
+ {
+ if(s2->resync_mb_x >= 0 && s2->resync_mb_y >= 0)
+ ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR | DC_ERROR | MV_ERROR);
+ // ==> Start patch MPC
+ else if(!s2->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ //}else{
+ // <== End patch MPC
+ ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x - 1, s2->mb_y, AC_END | DC_END | MV_END);
}
}
}
@@ -2457,10 +2840,11 @@ static int decode_chunks(AVCodecContext *avctx, }
}
-static void flush(AVCodecContext *avctx){
+static void flush(AVCodecContext *avctx)
+{
Mpeg1Context *s = avctx->priv_data;
- s->sync=0;
+ s->sync = 0;
ff_mpeg_flush(avctx);
}
@@ -2469,12 +2853,13 @@ static int mpeg_decode_end(AVCodecContext *avctx) {
Mpeg1Context *s = avctx->priv_data;
- if (s->mpeg_enc_ctx_allocated)
+ if(s->mpeg_enc_ctx_allocated)
MPV_common_end(&s->mpeg_enc_ctx);
return 0;
}
-AVCodec mpeg1video_decoder = {
+AVCodec mpeg1video_decoder =
+{
"mpeg1video",
CODEC_TYPE_VIDEO,
CODEC_ID_MPEG1VIDEO,
@@ -2491,7 +2876,8 @@ AVCodec mpeg1video_decoder = { /*.long_name= */NULL_IF_CONFIG_SMALL("MPEG-1 video"),
};
-AVCodec mpeg2video_decoder = {
+AVCodec mpeg2video_decoder =
+{
"mpeg2video",
CODEC_TYPE_VIDEO,
CODEC_ID_MPEG2VIDEO,
@@ -2505,11 +2891,12 @@ AVCodec mpeg2video_decoder = { /*.flush=*/flush,
/*.supported_framerates = */NULL,
/*.pix_fmts = */NULL,
-/*.long_name= */NULL_IF_CONFIG_SMALL("MPEG-2 video"),
+ /*.long_name= */NULL_IF_CONFIG_SMALL("MPEG-2 video"),
};
//legacy decoder
-AVCodec mpegvideo_decoder = {
+AVCodec mpegvideo_decoder =
+{
"mpegvideo",
CODEC_TYPE_VIDEO,
CODEC_ID_MPEG2VIDEO,
|