← Back to branch summary

~bratsche/vlc/vlc-notify-add-actions-with-server-support

« back to all changes in this revision

Viewing changes to extras/x264/encoder/macroblock.c

  • Committer: Bazaar Package Importer
  • Date: 2008-11-28 09:29:51 UTC
  • Revision ID: jamesw@ubuntu.com-20081128092951-0y5ojboptscru17f
Tags: upstream-ubuntu-0.8.6.release.e+x264svn20071224+faad2.6.1
Import upstream version 0.8.6.release.e+x264svn20071224+faad2.6.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
extras/x264/encoder/macroblock.c
296
296
                                h->mb.mv_min[1], h->mb.mv_max[1] );
297
297
 
298
298
    /* Motion compensation XXX probably unneeded */
299
 
    h->mc.mc_luma( h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
300
 
                   h->mb.pic.p_fdec[0],    FDEC_STRIDE,
 
299
    h->mc.mc_luma( h->mb.pic.p_fdec[0],    FDEC_STRIDE,
 
300
                   h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
301
301
                   mvx, mvy, 16, 16 );
302
302
 
303
303
    /* Chroma MC */
304
 
    h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4], h->mb.pic.i_stride[1],
305
 
                     h->mb.pic.p_fdec[1],       FDEC_STRIDE,
 
304
    h->mc.mc_chroma( h->mb.pic.p_fdec[1],       FDEC_STRIDE,
 
305
                     h->mb.pic.p_fref[0][0][4], h->mb.pic.i_stride[1],
306
306
                     mvx, mvy, 8, 8 );
307
307
 
308
 
    h->mc.mc_chroma( h->mb.pic.p_fref[0][0][5], h->mb.pic.i_stride[2],
309
 
                     h->mb.pic.p_fdec[2],       FDEC_STRIDE,
 
308
    h->mc.mc_chroma( h->mb.pic.p_fdec[2],       FDEC_STRIDE,
 
309
                     h->mb.pic.p_fref[0][0][5], h->mb.pic.i_stride[2],
310
310
                     mvx, mvy, 8, 8 );
311
311
 
312
312
    x264_macroblock_encode_skip( h );
618
618
        mvp[1] = x264_clip3( h->mb.cache.pskip_mv[1], h->mb.mv_min[1], h->mb.mv_max[1] );
619
619
 
620
620
        /* Motion compensation */
621
 
        h->mc.mc_luma( h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
622
 
                       h->mb.pic.p_fdec[0],    FDEC_STRIDE,
 
621
        h->mc.mc_luma( h->mb.pic.p_fdec[0],    FDEC_STRIDE,
 
622
                       h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
623
623
                       mvp[0], mvp[1], 16, 16 );
624
624
    }
625
625
 
657
657
 
658
658
        if( !b_bidir )
659
659
        {
660
 
            h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4+ch], h->mb.pic.i_stride[1+ch],
661
 
                             h->mb.pic.p_fdec[1+ch],       FDEC_STRIDE,
 
660
            h->mc.mc_chroma( h->mb.pic.p_fdec[1+ch],       FDEC_STRIDE,
 
661
                             h->mb.pic.p_fref[0][0][4+ch], h->mb.pic.i_stride[1+ch],
662
662
                             mvp[0], mvp[1], 8, 8 );
663
663
        }
664
664
 
705
705
    for( cat = 0; cat < 2; cat++ )
706
706
    {
707
707
        int size = cat ? 64 : 16;
708
 
        const int *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab;
 
708
        const uint16_t *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab;
709
709
 
710
710
        if( h->nr_count[cat] > (cat ? (1<<16) : (1<<18)) )
711
711
        {