[FFmpeg-cvslog] r20938 - trunk/libavcodec/h263.c

[Diego Biurrun]

On Mon, Jan 04, 2010 at 04:46:29PM +0100, Michael Niedermayer wrote:
> On Mon, Jan 04, 2010 at 04:39:07PM +0100, Diego Biurrun wrote:
> > On Mon, Jan 04, 2010 at 04:24:37PM +0100, Michael Niedermayer wrote:
> > > On Fri, Jan 01, 2010 at 09:43:35PM +0100, Michael Niedermayer wrote:
> > > > On Sun, Dec 27, 2009 at 03:32:23PM +0100, diego wrote:
> > > > > 
> > > > > Log:
> > > > > Remove commented-out debug console output.
> > > > [...]
> > > > > @@ -2642,7 +2636,6 @@ void mpeg4_pred_ac(MpegEncContext * s, D
> > > > >  static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
> > > > >  {
> > > > >  #if 1
> > > > > -//    if(level<-255 || level>255) printf("dc overflow\n");
> > > > >      level+=256;
> > > > >      if (n < 4) {
> > > > >          /* luminance */
> > > > [...]
> > > > > @@ -5807,7 +5771,6 @@ no_cplx_est:
> > > > >              if(   h_sampling_factor_n==0 || h_sampling_factor_m==0
> > > > >                 || v_sampling_factor_n==0 || v_sampling_factor_m==0){
> > > > >  
> > > > > -//                fprintf(stderr, "illegal scalability header (VERY broken encoder), trying to workaround\n");
> > > > >                  s->scalability=0;
> > > > >  
> > > > >                  *gb= bak;
> > > > [...]
> > > > >          s->time_base+= time_incr;
> > > > >          s->time= s->time_base*s->avctx->time_base.den + time_increment;
> > > > >          if(s->workaround_bugs&FF_BUG_UMP4){
> > > > >              if(s->time < s->last_non_b_time){
> > > > > -//                fprintf(stderr, "header is not mpeg4 compatible, broken encoder, trying to workaround\n");
> > > > >                  s->time_base++;
> > > > >                  s->time+= s->avctx->time_base.den;
> > > > >              }
> > > > > @@ -5936,7 +5895,6 @@ static int decode_vop_header(MpegEncCont
> > > > >          s->time= (s->last_time_base + time_incr)*s->avctx->time_base.den + time_increment;
> > > > >          s->pb_time= s->pp_time - (s->last_non_b_time - s->time);
> > > > >          if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){
> > > > > -//            printf("messed up order, maybe after seeking? skipping current b frame\n");
> > > > >              return FRAME_SKIPPED;
> > > > >          }
> > > > >          ff_mpeg4_init_direct_mv(s);
> > > > 
> > > > removing above lines makes the code harder to understand
> > > 
> > > also, just to clarify, i think this should be reverted
> > 
> > How about adding the information as comments instead of as crufty debug
> > statements.
> 
> Thats possible but more work than just reverting these hunks
> (and iam not volunteering to do that nor would i ask someone else to
>  do such cosmetic work)

Hardly, this is less than the complete commit, it boils down to cutting
and pasting or modifying a diff by hand...

Diego