← Back to branch summary

~ubuntu-branches/ubuntu/precise/x264/precise

« back to all changes in this revision

Viewing changes to encoder/cavlc.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Fabian Greffrath, Reinhard Tartler
  • Date: 2012-02-10 21:26:18 UTC
  • mfrom: (12.1.12 experimental)
  • Revision ID: package-import@ubuntu.com-20120210212618-vsfw1bwsbrk7n4ju
Tags: 2:0.120.2151+gita3f4407-2
http://bugs.debian.org/642810
http://bugs.debian.org/657019
https://launchpad.net/bugs/919509
[ Fabian Greffrath ]
* Meanwhile, upstream enabled PIC for the shared library build on ia64,
  mips* and hppa/parisc (once more closes: #642810), so remove our
  Debian-specific workarounds.

[ Reinhard Tartler ]
* Build against libgpac to enable MP4 output
* Add a note about non-relocatable code in the README.Debian file,
  Closes: #657019, LP: #919509

Show diffs side-by-side

added added

removed removed

Lines of Context:
encoder/cavlc.c
132
132
    runlevel.level[1] = 2;
133
133
    runlevel.level[2] = 2;
134
134
    i_total = h->quantf.coeff_level_run[ctx_block_cat]( l, &runlevel );
 
135
    x264_prefetch( &x264_run_before[runlevel.mask] );
135
136
    i_total_zero = runlevel.last + 1 - i_total;
136
137
 
137
138
    i_trailing = ((((runlevel.level[0]+1) | (1-runlevel.level[0])) >> 31) & 1) // abs(runlevel.level[0])>1
188
189
    else if( (uint8_t)i_total < count_cat[ctx_block_cat] )
189
190
        bs_write_vlc( s, x264_total_zeros[i_total-1][i_total_zero] );
190
191
 
191
 
    for( int i = 0; i < i_total-1 && i_total_zero > 0; i++ )
192
 
    {
193
 
        int i_zl = X264_MIN( i_total_zero, 7 );
194
 
        bs_write_vlc( s, x264_run_before[i_zl-1][runlevel.run[i]] );
195
 
        i_total_zero -= runlevel.run[i];
196
 
    }
 
192
    int zero_run_code = x264_run_before[runlevel.mask];
 
193
    bs_write( s, zero_run_code&0x1f, zero_run_code>>5 );
197
194
 
198
195
    return i_total;
199
196
}