Mercurial > mplayer.hg

comparison libmpdemux/muxer_mpeg.c @ 22323:db082b1a4e77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: reindented
author nicodvb
date Sun, 25 Feb 2007 14:33:19 +0000
parents 980198eb8dcb
children 42d21ca22e7e
comparison
equal deleted inserted replaced
22322:980198eb8dcb 22323:db082b1a4e77
1693 temp_ref = (s->buffer[ptr+4]<<2)+(s->buffer[ptr+5]>>6); 1693 temp_ref = (s->buffer[ptr+4]<<2)+(s->buffer[ptr+5]>>6);
1694 if(!spriv->vframes) 1694 if(!spriv->vframes)
1695 spriv->last_tr = spriv->max_tr = temp_ref; 1695 spriv->last_tr = spriv->max_tr = temp_ref;
1696 d1 = temp_ref - spriv->last_tr; 1696 d1 = temp_ref - spriv->last_tr;
1697 if(gop_reset) 1697 if(gop_reset)
1698 {
1699 frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr; 1698 frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr;
1700 }
1701 else 1699 else
1702 { 1700 {
1703 if(d1 < -6) //there's a wraparound 1701 if(d1 < -6) //there's a wraparound
1704 frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr; 1702 frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr;
1705 else if(d1 > 6) //there's a wraparound 1703 else if(d1 > 6) //there's a wraparound
1706 frames_diff = spriv->max_tr + 1 + spriv->last_tr - temp_ref; 1704 frames_diff = spriv->max_tr + 1 + spriv->last_tr - temp_ref;
1707 else if(!d1) //pre-emptive fix against broken sequences 1705 else if(!d1) //pre-emptive fix against broken sequences
1708 frames_diff = 1; 1706 frames_diff = 1;
1709 else 1707 else
1710 frames_diff = d1; 1708 frames_diff = d1;
1711 } 1709 }
1712 mp_msg(MSGT_MUXER, MSGL_DBG2, "\nLAST: %d, TR: %d, GOP: %d, DIFF: %d, MAX: %d, d1: %d\n", 1710 mp_msg(MSGT_MUXER, MSGL_DBG2, "\nLAST: %d, TR: %d, GOP: %d, DIFF: %d, MAX: %d, d1: %d\n",
1713 spriv->last_tr, temp_ref, gop_reset, frames_diff, spriv->max_tr, d1); 1711 spriv->last_tr, temp_ref, gop_reset, frames_diff, spriv->max_tr, d1);
1714 1712
1715 if(temp_ref > spriv->max_tr || gop_reset) 1713 if(temp_ref > spriv->max_tr || gop_reset)