*****************************************************************************
* Copyright (C) 2003-2008 x264 project
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Fiona Glaser <fiona@x264.com>
+ * Laurent Aimar <fenrir@via.ecp.fr>
* Loren Merritt <lorenm@u.washington.edu>
- * Fiona Glaser <fiona@x264.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "common.h"
#include "encoder/me.h"
-void x264_mb_predict_mv( x264_t *h, int i_list, int idx, int i_width, int16_t mvp[2] )
+static NOINLINE void x264_mb_mc_0xywh( x264_t *h, int x, int y, int width, int height )
{
- const int i8 = x264_scan8[idx];
- const int i_ref= h->mb.cache.ref[i_list][i8];
- int i_refa = h->mb.cache.ref[i_list][i8 - 1];
- int16_t *mv_a = h->mb.cache.mv[i_list][i8 - 1];
- int i_refb = h->mb.cache.ref[i_list][i8 - 8];
- int16_t *mv_b = h->mb.cache.mv[i_list][i8 - 8];
- int i_refc = h->mb.cache.ref[i_list][i8 - 8 + i_width ];
- int16_t *mv_c = h->mb.cache.mv[i_list][i8 - 8 + i_width];
-
- int i_count = 0;
-
- if( (idx&3) >= 2 + (i_width&1) || i_refc == -2 )
- {
- i_refc = h->mb.cache.ref[i_list][i8 - 8 - 1];
- mv_c = h->mb.cache.mv[i_list][i8 - 8 - 1];
- }
-
- if( h->mb.i_partition == D_16x8 )
- {
- if( idx == 0 )
- {
- if( i_refb == i_ref )
- {
- *(uint32_t*)mvp = *(uint32_t*)mv_b;
- return;
- }
- }
- else
- {
- if( i_refa == i_ref )
- {
- *(uint32_t*)mvp = *(uint32_t*)mv_a;
- return;
- }
- }
- }
- else if( h->mb.i_partition == D_8x16 )
- {
- if( idx == 0 )
- {
- if( i_refa == i_ref )
- {
- *(uint32_t*)mvp = *(uint32_t*)mv_a;
- return;
- }
- }
- else
- {
- if( i_refc == i_ref )
- {
- *(uint32_t*)mvp = *(uint32_t*)mv_c;
- return;
- }
- }
- }
-
- if( i_refa == i_ref ) i_count++;
- if( i_refb == i_ref ) i_count++;
- if( i_refc == i_ref ) i_count++;
-
- if( i_count > 1 )
- {
-median:
- x264_median_mv( mvp, mv_a, mv_b, mv_c );
- }
- else if( i_count == 1 )
- {
- if( i_refa == i_ref )
- *(uint32_t*)mvp = *(uint32_t*)mv_a;
- else if( i_refb == i_ref )
- *(uint32_t*)mvp = *(uint32_t*)mv_b;
- else
- *(uint32_t*)mvp = *(uint32_t*)mv_c;
- }
- else if( i_refb == -2 && i_refc == -2 && i_refa != -2 )
- *(uint32_t*)mvp = *(uint32_t*)mv_a;
- else
- goto median;
-}
-
-void x264_mb_predict_mv_16x16( x264_t *h, int i_list, int i_ref, int16_t mvp[2] )
-{
- int i_refa = h->mb.cache.ref[i_list][X264_SCAN8_0 - 1];
- int16_t *mv_a = h->mb.cache.mv[i_list][X264_SCAN8_0 - 1];
- int i_refb = h->mb.cache.ref[i_list][X264_SCAN8_0 - 8];
- int16_t *mv_b = h->mb.cache.mv[i_list][X264_SCAN8_0 - 8];
- int i_refc = h->mb.cache.ref[i_list][X264_SCAN8_0 - 8 + 4];
- int16_t *mv_c = h->mb.cache.mv[i_list][X264_SCAN8_0 - 8 + 4];
-
- int i_count = 0;
-
- if( i_refc == -2 )
- {
- i_refc = h->mb.cache.ref[i_list][X264_SCAN8_0 - 8 - 1];
- mv_c = h->mb.cache.mv[i_list][X264_SCAN8_0 - 8 - 1];
- }
-
- if( i_refa == i_ref ) i_count++;
- if( i_refb == i_ref ) i_count++;
- if( i_refc == i_ref ) i_count++;
-
- if( i_count > 1 )
- {
-median:
- x264_median_mv( mvp, mv_a, mv_b, mv_c );
- }
- else if( i_count == 1 )
- {
- if( i_refa == i_ref )
- *(uint32_t*)mvp = *(uint32_t*)mv_a;
- else if( i_refb == i_ref )
- *(uint32_t*)mvp = *(uint32_t*)mv_b;
- else
- *(uint32_t*)mvp = *(uint32_t*)mv_c;
- }
- else if( i_refb == -2 && i_refc == -2 && i_refa != -2 )
- *(uint32_t*)mvp = *(uint32_t*)mv_a;
- else
- goto median;
-}
-
-
-void x264_mb_predict_mv_pskip( x264_t *h, int16_t mv[2] )
-{
- int i_refa = h->mb.cache.ref[0][X264_SCAN8_0 - 1];
- int i_refb = h->mb.cache.ref[0][X264_SCAN8_0 - 8];
- int16_t *mv_a = h->mb.cache.mv[0][X264_SCAN8_0 - 1];
- int16_t *mv_b = h->mb.cache.mv[0][X264_SCAN8_0 - 8];
-
- if( i_refa == -2 || i_refb == -2 ||
- !( i_refa | *(uint32_t*)mv_a ) ||
- !( i_refb | *(uint32_t*)mv_b ) )
- {
- *(uint32_t*)mv = 0;
- }
- else
- {
- x264_mb_predict_mv_16x16( h, 0, 0, mv );
- }
-}
-
-static int x264_mb_predict_mv_direct16x16_temporal( x264_t *h )
-{
- int i_mb_4x4 = 16 * h->mb.i_mb_stride * h->mb.i_mb_y + 4 * h->mb.i_mb_x;
- int i_mb_8x8 = 4 * h->mb.i_mb_stride * h->mb.i_mb_y + 2 * h->mb.i_mb_x;
- int i8;
- const int type_col = h->fref1[0]->mb_type[ h->mb.i_mb_xy ];
-
- x264_macroblock_cache_ref( h, 0, 0, 4, 4, 1, 0 );
-
- if( IS_INTRA( type_col ) )
- {
- x264_macroblock_cache_ref( h, 0, 0, 4, 4, 0, 0 );
- x264_macroblock_cache_mv( h, 0, 0, 4, 4, 0, 0 );
- x264_macroblock_cache_mv( h, 0, 0, 4, 4, 1, 0 );
- return 1;
- }
-
- for( i8 = 0; i8 < 4; i8++ )
- {
- const int x8 = i8%2;
- const int y8 = i8/2;
- const int i_part_8x8 = i_mb_8x8 + x8 + y8 * h->mb.i_b8_stride;
- const int i_ref = h->mb.map_col_to_list0[ h->fref1[0]->ref[0][ i_part_8x8 ] ];
-
- if( i_ref >= 0 )
- {
- const int dist_scale_factor = h->mb.dist_scale_factor[i_ref][0];
- const int16_t *mv_col = h->fref1[0]->mv[0][ i_mb_4x4 + 3*x8 + 3*y8 * h->mb.i_b4_stride];
- const int l0x = ( dist_scale_factor * mv_col[0] + 128 ) >> 8;
- const int l0y = ( dist_scale_factor * mv_col[1] + 128 ) >> 8;
- if( h->param.i_threads > 1 && (l0y > h->mb.mv_max_spel[1] || l0y-mv_col[1] > h->mb.mv_max_spel[1]) )
- return 0;
- x264_macroblock_cache_ref( h, 2*x8, 2*y8, 2, 2, 0, i_ref );
- x264_macroblock_cache_mv( h, 2*x8, 2*y8, 2, 2, 0, pack16to32_mask(l0x, l0y) );
- x264_macroblock_cache_mv( h, 2*x8, 2*y8, 2, 2, 1, pack16to32_mask(l0x-mv_col[0], l0y-mv_col[1]) );
- }
- else
- {
- /* the collocated ref isn't in the current list0 */
- /* FIXME: we might still be able to use direct_8x8 on some partitions */
- /* FIXME: with B-pyramid + extensive ref list reordering
- * (not currently used), we would also have to check
- * l1mv1 like in spatial mode */
- return 0;
- }
- }
-
- return 1;
-}
-
-static int x264_mb_predict_mv_direct16x16_spatial( x264_t *h )
-{
- int ref[2];
- DECLARE_ALIGNED_8( int16_t mv[2][2] );
- int i_list;
- int i8;
- const int8_t *l1ref0 = &h->fref1[0]->ref[0][ h->mb.i_b8_xy ];
- const int8_t *l1ref1 = &h->fref1[0]->ref[1][ h->mb.i_b8_xy ];
- const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->fref1[0]->mv[0][ h->mb.i_b4_xy ];
- const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->fref1[0]->mv[1][ h->mb.i_b4_xy ];
- const int type_col = h->fref1[0]->mb_type[ h->mb.i_mb_xy ];
-
- for( i_list=0; i_list<2; i_list++ )
- {
- int i_refa = h->mb.cache.ref[i_list][X264_SCAN8_0 - 1];
- int i_refb = h->mb.cache.ref[i_list][X264_SCAN8_0 - 8];
- int i_refc = h->mb.cache.ref[i_list][X264_SCAN8_0 - 8 + 4];
- if( i_refc == -2 )
- i_refc = h->mb.cache.ref[i_list][X264_SCAN8_0 - 8 - 1];
-
- ref[i_list] = i_refa;
- if( ref[i_list] < 0 || ( i_refb < ref[i_list] && i_refb >= 0 ))
- ref[i_list] = i_refb;
- if( ref[i_list] < 0 || ( i_refc < ref[i_list] && i_refc >= 0 ))
- ref[i_list] = i_refc;
- if( ref[i_list] < 0 )
- ref[i_list] = -1;
- }
-
- if( ref[0] < 0 && ref[1] < 0 )
- {
- x264_macroblock_cache_ref( h, 0, 0, 4, 4, 0, 0 );
- x264_macroblock_cache_ref( h, 0, 0, 4, 4, 1, 0 );
- x264_macroblock_cache_mv( h, 0, 0, 4, 4, 0, 0 );
- x264_macroblock_cache_mv( h, 0, 0, 4, 4, 1, 0 );
- return 1;
- }
-
- if( ref[0] >= 0 )
- x264_mb_predict_mv_16x16( h, 0, ref[0], mv[0] );
- else
- *(uint32_t*)mv[0] = 0;
- if( ref[1] >= 0 )
- x264_mb_predict_mv_16x16( h, 1, ref[1], mv[1] );
- else
- *(uint32_t*)mv[1] = 0;
-
- x264_macroblock_cache_ref( h, 0, 0, 4, 4, 0, ref[0] );
- x264_macroblock_cache_ref( h, 0, 0, 4, 4, 1, ref[1] );
- x264_macroblock_cache_mv_ptr( h, 0, 0, 4, 4, 0, mv[0] );
- x264_macroblock_cache_mv_ptr( h, 0, 0, 4, 4, 1, mv[1] );
-
- if( h->param.i_threads > 1
- && ( mv[0][1] > h->mb.mv_max_spel[1]
- || mv[1][1] > h->mb.mv_max_spel[1] ) )
- {
-#if 0
- fprintf(stderr, "direct_spatial: (%d,%d) (%d,%d) > %d \n",
- mv[0][0], mv[0][1], mv[1][0], mv[1][1],
- h->mb.mv_max_spel[1]);
-#endif
- return 0;
- }
-
- if( IS_INTRA( type_col ) || (ref[0]&&ref[1]) )
- return 1;
-
- /* col_zero_flag */
- for( i8=0; i8<4; i8++ )
- {
- const int x8 = i8%2;
- const int y8 = i8/2;
- const int o8 = x8 + y8 * h->mb.i_b8_stride;
- const int o4 = 3*(x8 + y8 * h->mb.i_b4_stride);
- if( l1ref0[o8] == 0 )
- {
- if( abs( l1mv0[o4][0] ) <= 1 && abs( l1mv0[o4][1] ) <= 1 )
- {
- if( ref[0] == 0 ) x264_macroblock_cache_mv( h, 2*x8, 2*y8, 2, 2, 0, 0 );
- if( ref[1] == 0 ) x264_macroblock_cache_mv( h, 2*x8, 2*y8, 2, 2, 1, 0 );
- }
- }
- else if( l1ref0[o8] < 0 && l1ref1[o8] == 0 )
- {
- if( abs( l1mv1[o4][0] ) <= 1 && abs( l1mv1[o4][1] ) <= 1 )
- {
- if( ref[0] == 0 ) x264_macroblock_cache_mv( h, 2*x8, 2*y8, 2, 2, 0, 0 );
- if( ref[1] == 0 ) x264_macroblock_cache_mv( h, 2*x8, 2*y8, 2, 2, 1, 0 );
- }
- }
- }
-
- return 1;
-}
-
-int x264_mb_predict_mv_direct16x16( x264_t *h, int *b_changed )
-{
- int b_available;
- if( h->param.analyse.i_direct_mv_pred == X264_DIRECT_PRED_NONE )
- return 0;
- else if( h->sh.b_direct_spatial_mv_pred )
- b_available = x264_mb_predict_mv_direct16x16_spatial( h );
- else
- b_available = x264_mb_predict_mv_direct16x16_temporal( h );
-
- if( b_changed != NULL && b_available )
- {
- int type_col = h->fref1[0]->mb_type[ h->mb.i_mb_xy ];
- if( IS_INTRA(type_col) || type_col == P_SKIP )
- {
- *b_changed = h->mb.cache.direct_ref[0][0] != h->mb.cache.ref[0][X264_SCAN8_0]
- || h->mb.cache.direct_ref[1][0] != h->mb.cache.ref[1][X264_SCAN8_0]
- || *(uint32_t*)h->mb.cache.direct_mv[0][X264_SCAN8_0] != *(uint32_t*)h->mb.cache.mv[0][X264_SCAN8_0]
- || *(uint32_t*)h->mb.cache.direct_mv[1][X264_SCAN8_0] != *(uint32_t*)h->mb.cache.mv[1][X264_SCAN8_0];
- }
- else
- {
- int i, l;
- *b_changed = 0;
- for( l = 0; l < 2; l++ )
- for( i = 0; i < 4; i++ )
- *b_changed |= h->mb.cache.direct_ref[l][i] != h->mb.cache.ref[l][x264_scan8[i*4]];
- *b_changed = *b_changed || memcmp(h->mb.cache.direct_mv, h->mb.cache.mv, sizeof(h->mb.cache.mv));
- }
- if( !*b_changed )
- return b_available;
- }
-
- /* cache ref & mv */
- if( b_available )
- {
- int i, l;
- for( l = 0; l < 2; l++ )
- for( i = 0; i < 4; i++ )
- h->mb.cache.direct_ref[l][i] = h->mb.cache.ref[l][x264_scan8[i*4]];
- h->mc.memcpy_aligned(h->mb.cache.direct_mv, h->mb.cache.mv, sizeof(h->mb.cache.mv));
- }
-
- return b_available;
-}
-
-void x264_mb_load_mv_direct8x8( x264_t *h, int idx )
-{
- const int x = 2*(idx%2);
- const int y = 2*(idx/2);
- x264_macroblock_cache_ref( h, x, y, 2, 2, 0, h->mb.cache.direct_ref[0][idx] );
- x264_macroblock_cache_ref( h, x, y, 2, 2, 1, h->mb.cache.direct_ref[1][idx] );
- *(uint64_t*)h->mb.cache.mv[0][x264_scan8[idx*4]] =
- *(uint64_t*)h->mb.cache.direct_mv[0][x264_scan8[idx*4]];
- *(uint64_t*)h->mb.cache.mv[0][x264_scan8[idx*4]+8] =
- *(uint64_t*)h->mb.cache.direct_mv[0][x264_scan8[idx*4]+8];
- *(uint64_t*)h->mb.cache.mv[1][x264_scan8[idx*4]] =
- *(uint64_t*)h->mb.cache.direct_mv[1][x264_scan8[idx*4]];
- *(uint64_t*)h->mb.cache.mv[1][x264_scan8[idx*4]+8] =
- *(uint64_t*)h->mb.cache.direct_mv[1][x264_scan8[idx*4]+8];
-}
-
-/* This just improves encoder performance, it's not part of the spec */
-void x264_mb_predict_mv_ref16x16( x264_t *h, int i_list, int i_ref, int16_t mvc[9][2], int *i_mvc )
-{
- int16_t (*mvr)[2] = h->mb.mvr[i_list][i_ref];
- int i = 0;
-
-#define SET_MVP(mvp) { \
- *(uint32_t*)mvc[i] = *(uint32_t*)mvp; \
- i++; \
- }
-
- /* b_direct */
- if( h->sh.i_type == SLICE_TYPE_B
- && h->mb.cache.ref[i_list][x264_scan8[12]] == i_ref )
- {
- SET_MVP( h->mb.cache.mv[i_list][x264_scan8[12]] );
- }
-
- if( i_ref == 0 && h->frames.b_have_lowres )
- {
- int16_t (*lowres_mv)[2] = i_list ? h->fenc->lowres_mvs[1][h->fref1[0]->i_frame-h->fenc->i_frame-1]
- : h->fenc->lowres_mvs[0][h->fenc->i_frame-h->fref0[0]->i_frame-1];
- if( lowres_mv[0][0] != 0x7fff ) *(uint32_t*)mvc[i++] = (*(uint32_t*)lowres_mv[h->mb.i_mb_xy]*2)&0xfffeffff;
- }
-
- /* spatial predictors */
- if( h->mb.i_neighbour & MB_LEFT )
- {
- int i_mb_l = h->mb.i_mb_xy - 1;
- /* skip MBs didn't go through the whole search process, so mvr is undefined */
- if( !IS_SKIP( h->mb.type[i_mb_l] ) )
- SET_MVP( mvr[i_mb_l] );
- }
- if( h->mb.i_neighbour & MB_TOP )
- {
- int i_mb_t = h->mb.i_mb_top_xy;
- if( !IS_SKIP( h->mb.type[i_mb_t] ) )
- SET_MVP( mvr[i_mb_t] );
-
- if( h->mb.i_neighbour & MB_TOPLEFT && !IS_SKIP( h->mb.type[i_mb_t - 1] ) )
- SET_MVP( mvr[i_mb_t-1] );
- if( h->mb.i_mb_x < h->mb.i_mb_stride - 1 && !IS_SKIP( h->mb.type[i_mb_t + 1] ) )
- SET_MVP( mvr[i_mb_t+1] );
- }
-#undef SET_MVP
-
- /* temporal predictors */
- /* FIXME temporal scaling w/ interlace */
- if( h->fref0[0]->i_ref[0] > 0 && !h->sh.b_mbaff )
- {
- x264_frame_t *l0 = h->fref0[0];
-
-#define SET_TMVP(dx, dy) { \
- int i_b4 = h->mb.i_b4_xy + dx*4 + dy*4*h->mb.i_b4_stride; \
- int i_b8 = h->mb.i_b8_xy + dx*2 + dy*2*h->mb.i_b8_stride; \
- int ref_col = l0->ref[0][i_b8]; \
- if( ref_col >= 0 ) \
- { \
- int scale = (h->fdec->i_poc - h->fdec->ref_poc[0][i_ref]) * l0->inv_ref_poc[ref_col];\
- mvc[i][0] = (l0->mv[0][i_b4][0]*scale + 128) >> 8;\
- mvc[i][1] = (l0->mv[0][i_b4][1]*scale + 128) >> 8;\
- i++; \
- } \
- }
-
- SET_TMVP(0,0);
- if( h->mb.i_mb_x < h->sps->i_mb_width-1 )
- SET_TMVP(1,0);
- if( h->mb.i_mb_y < h->sps->i_mb_height-1 )
- SET_TMVP(0,1);
-#undef SET_TMVP
- }
-
- *i_mvc = i;
-}
-
-/* Set up a lookup table for delta pocs to reduce an IDIV to an IMUL */
-static void setup_inverse_delta_pocs( x264_t *h )
-{
- int i;
- for( i = 0; i < h->i_ref0; i++ )
- {
- int delta = h->fdec->i_poc - h->fref0[i]->i_poc;
- h->fdec->inv_ref_poc[i] = (256 + delta/2) / delta;
- }
-}
-
-static inline void x264_mb_mc_0xywh( x264_t *h, int x, int y, int width, int height )
-{
- const int i8 = x264_scan8[0]+x+8*y;
- const int i_ref = h->mb.cache.ref[0][i8];
- const int mvx = x264_clip3( h->mb.cache.mv[0][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] );
- int mvy = x264_clip3( h->mb.cache.mv[0][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] );
+ int i8 = x264_scan8[0]+x+8*y;
+ int i_ref = h->mb.cache.ref[0][i8];
+ int mvx = x264_clip3( h->mb.cache.mv[0][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] ) + 4*4*x;
+ int mvy = x264_clip3( h->mb.cache.mv[0][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] ) + 4*4*y;
h->mc.mc_luma( &h->mb.pic.p_fdec[0][4*y*FDEC_STRIDE+4*x], FDEC_STRIDE,
h->mb.pic.p_fref[0][i_ref], h->mb.pic.i_stride[0],
- mvx + 4*4*x, mvy + 4*4*y, 4*width, 4*height );
+ mvx, mvy, 4*width, 4*height, &h->sh.weight[i_ref][0] );
// chroma is offset if MCing from a field of opposite parity
if( h->mb.b_interlaced & i_ref )
mvy += (h->mb.i_mb_y & 1)*4 - 2;
h->mc.mc_chroma( &h->mb.pic.p_fdec[1][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
- &h->mb.pic.p_fref[0][i_ref][4][2*y*h->mb.pic.i_stride[1]+2*x], h->mb.pic.i_stride[1],
+ h->mb.pic.p_fref[0][i_ref][4], h->mb.pic.i_stride[1],
mvx, mvy, 2*width, 2*height );
+ if( h->sh.weight[i_ref][1].weightfn )
+ h->sh.weight[i_ref][1].weightfn[width>>1]( &h->mb.pic.p_fdec[1][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
+ &h->mb.pic.p_fdec[1][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
+ &h->sh.weight[i_ref][1], height*2 );
+
h->mc.mc_chroma( &h->mb.pic.p_fdec[2][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
- &h->mb.pic.p_fref[0][i_ref][5][2*y*h->mb.pic.i_stride[2]+2*x], h->mb.pic.i_stride[2],
+ h->mb.pic.p_fref[0][i_ref][5], h->mb.pic.i_stride[2],
mvx, mvy, 2*width, 2*height );
+
+ if( h->sh.weight[i_ref][2].weightfn )
+ h->sh.weight[i_ref][2].weightfn[width>>1]( &h->mb.pic.p_fdec[2][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
+ &h->mb.pic.p_fdec[2][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
+ &h->sh.weight[i_ref][2],height*2 );
+
}
-static inline void x264_mb_mc_1xywh( x264_t *h, int x, int y, int width, int height )
+static NOINLINE void x264_mb_mc_1xywh( x264_t *h, int x, int y, int width, int height )
{
- const int i8 = x264_scan8[0]+x+8*y;
- const int i_ref = h->mb.cache.ref[1][i8];
- const int mvx = x264_clip3( h->mb.cache.mv[1][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] );
- int mvy = x264_clip3( h->mb.cache.mv[1][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] );
+ int i8 = x264_scan8[0]+x+8*y;
+ int i_ref = h->mb.cache.ref[1][i8];
+ int mvx = x264_clip3( h->mb.cache.mv[1][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] ) + 4*4*x;
+ int mvy = x264_clip3( h->mb.cache.mv[1][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] ) + 4*4*y;
h->mc.mc_luma( &h->mb.pic.p_fdec[0][4*y*FDEC_STRIDE+4*x], FDEC_STRIDE,
h->mb.pic.p_fref[1][i_ref], h->mb.pic.i_stride[0],
- mvx + 4*4*x, mvy + 4*4*y, 4*width, 4*height );
+ mvx, mvy, 4*width, 4*height, weight_none );
if( h->mb.b_interlaced & i_ref )
mvy += (h->mb.i_mb_y & 1)*4 - 2;
h->mc.mc_chroma( &h->mb.pic.p_fdec[1][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
- &h->mb.pic.p_fref[1][i_ref][4][2*y*h->mb.pic.i_stride[1]+2*x], h->mb.pic.i_stride[1],
+ h->mb.pic.p_fref[1][i_ref][4], h->mb.pic.i_stride[1],
mvx, mvy, 2*width, 2*height );
h->mc.mc_chroma( &h->mb.pic.p_fdec[2][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE,
- &h->mb.pic.p_fref[1][i_ref][5][2*y*h->mb.pic.i_stride[2]+2*x], h->mb.pic.i_stride[2],
+ h->mb.pic.p_fref[1][i_ref][5], h->mb.pic.i_stride[2],
mvx, mvy, 2*width, 2*height );
}
-static inline void x264_mb_mc_01xywh( x264_t *h, int x, int y, int width, int height )
+static NOINLINE void x264_mb_mc_01xywh( x264_t *h, int x, int y, int width, int height )
{
- const int i8 = x264_scan8[0]+x+8*y;
- const int i_ref0 = h->mb.cache.ref[0][i8];
- const int i_ref1 = h->mb.cache.ref[1][i8];
- const int weight = h->mb.bipred_weight[i_ref0][i_ref1];
- const int mvx0 = x264_clip3( h->mb.cache.mv[0][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] );
- const int mvx1 = x264_clip3( h->mb.cache.mv[1][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] );
- int mvy0 = x264_clip3( h->mb.cache.mv[0][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] );
- int mvy1 = x264_clip3( h->mb.cache.mv[1][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] );
- int i_mode = x264_size2pixel[height][width];
- int i_stride0 = 16, i_stride1 = 16;
- DECLARE_ALIGNED_16( uint8_t tmp0[16*16] );
- DECLARE_ALIGNED_16( uint8_t tmp1[16*16] );
- uint8_t *src0, *src1;
+ int i8 = x264_scan8[0]+x+8*y;
+ int i_ref0 = h->mb.cache.ref[0][i8];
+ int i_ref1 = h->mb.cache.ref[1][i8];
+ int weight = h->mb.bipred_weight[i_ref0][i_ref1];
+ int mvx0 = x264_clip3( h->mb.cache.mv[0][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] ) + 4*4*x;
+ int mvx1 = x264_clip3( h->mb.cache.mv[1][i8][0], h->mb.mv_min[0], h->mb.mv_max[0] ) + 4*4*x;
+ int mvy0 = x264_clip3( h->mb.cache.mv[0][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] ) + 4*4*y;
+ int mvy1 = x264_clip3( h->mb.cache.mv[1][i8][1], h->mb.mv_min[1], h->mb.mv_max[1] ) + 4*4*y;
+ int i_mode = x264_size2pixel[height][width];
+ int i_stride0 = 16, i_stride1 = 16;
+ ALIGNED_ARRAY_16( pixel, tmp0,[16*16] );
+ ALIGNED_ARRAY_16( pixel, tmp1,[16*16] );
+ pixel *src0, *src1;
src0 = h->mc.get_ref( tmp0, &i_stride0, h->mb.pic.p_fref[0][i_ref0], h->mb.pic.i_stride[0],
- mvx0 + 4*4*x, mvy0 + 4*4*y, 4*width, 4*height );
+ mvx0, mvy0, 4*width, 4*height, weight_none );
src1 = h->mc.get_ref( tmp1, &i_stride1, h->mb.pic.p_fref[1][i_ref1], h->mb.pic.i_stride[0],
- mvx1 + 4*4*x, mvy1 + 4*4*y, 4*width, 4*height );
+ mvx1, mvy1, 4*width, 4*height, weight_none );
h->mc.avg[i_mode]( &h->mb.pic.p_fdec[0][4*y*FDEC_STRIDE+4*x], FDEC_STRIDE,
src0, i_stride0, src1, i_stride1, weight );
if( h->mb.b_interlaced & i_ref1 )
mvy1 += (h->mb.i_mb_y & 1)*4 - 2;
- h->mc.mc_chroma( tmp0, 16, &h->mb.pic.p_fref[0][i_ref0][4][2*y*h->mb.pic.i_stride[1]+2*x], h->mb.pic.i_stride[1],
+ h->mc.mc_chroma( tmp0, 16, h->mb.pic.p_fref[0][i_ref0][4], h->mb.pic.i_stride[1],
mvx0, mvy0, 2*width, 2*height );
- h->mc.mc_chroma( tmp1, 16, &h->mb.pic.p_fref[1][i_ref1][4][2*y*h->mb.pic.i_stride[1]+2*x], h->mb.pic.i_stride[1],
+ h->mc.mc_chroma( tmp1, 16, h->mb.pic.p_fref[1][i_ref1][4], h->mb.pic.i_stride[1],
mvx1, mvy1, 2*width, 2*height );
h->mc.avg[i_mode+3]( &h->mb.pic.p_fdec[1][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE, tmp0, 16, tmp1, 16, weight );
- h->mc.mc_chroma( tmp0, 16, &h->mb.pic.p_fref[0][i_ref0][5][2*y*h->mb.pic.i_stride[2]+2*x], h->mb.pic.i_stride[2],
+ h->mc.mc_chroma( tmp0, 16, h->mb.pic.p_fref[0][i_ref0][5], h->mb.pic.i_stride[2],
mvx0, mvy0, 2*width, 2*height );
- h->mc.mc_chroma( tmp1, 16, &h->mb.pic.p_fref[1][i_ref1][5][2*y*h->mb.pic.i_stride[2]+2*x], h->mb.pic.i_stride[2],
+ h->mc.mc_chroma( tmp1, 16, h->mb.pic.p_fref[1][i_ref1][5], h->mb.pic.i_stride[2],
mvx1, mvy1, 2*width, 2*height );
h->mc.avg[i_mode+3]( &h->mb.pic.p_fdec[2][2*y*FDEC_STRIDE+2*x], FDEC_STRIDE, tmp0, 16, tmp1, 16, weight );
}
-static void x264_mb_mc_direct8x8( x264_t *h, int x, int y )
+void x264_mb_mc_8x8( x264_t *h, int i8 )
{
- const int i8 = x264_scan8[0] + x + 8*y;
+ int x = 2*(i8&1);
+ int y = 2*(i8>>1);
- if( h->mb.cache.ref[0][i8] >= 0 )
- if( h->mb.cache.ref[1][i8] >= 0 )
- x264_mb_mc_01xywh( h, x, y, 2, 2 );
- else
- x264_mb_mc_0xywh( h, x, y, 2, 2 );
+ if( h->sh.i_type == SLICE_TYPE_P )
+ {
+ switch( h->mb.i_sub_partition[i8] )
+ {
+ case D_L0_8x8:
+ x264_mb_mc_0xywh( h, x, y, 2, 2 );
+ break;
+ case D_L0_8x4:
+ x264_mb_mc_0xywh( h, x, y+0, 2, 1 );
+ x264_mb_mc_0xywh( h, x, y+1, 2, 1 );
+ break;
+ case D_L0_4x8:
+ x264_mb_mc_0xywh( h, x+0, y, 1, 2 );
+ x264_mb_mc_0xywh( h, x+1, y, 1, 2 );
+ break;
+ case D_L0_4x4:
+ x264_mb_mc_0xywh( h, x+0, y+0, 1, 1 );
+ x264_mb_mc_0xywh( h, x+1, y+0, 1, 1 );
+ x264_mb_mc_0xywh( h, x+0, y+1, 1, 1 );
+ x264_mb_mc_0xywh( h, x+1, y+1, 1, 1 );
+ break;
+ }
+ }
else
- x264_mb_mc_1xywh( h, x, y, 2, 2 );
-}
-
-void x264_mb_mc_8x8( x264_t *h, int i8 )
-{
- const int x = 2*(i8&1);
- const int y = 2*(i8>>1);
- switch( h->mb.i_sub_partition[i8] )
{
- case D_L0_8x8:
- x264_mb_mc_0xywh( h, x, y, 2, 2 );
- break;
- case D_L0_8x4:
- x264_mb_mc_0xywh( h, x, y+0, 2, 1 );
- x264_mb_mc_0xywh( h, x, y+1, 2, 1 );
- break;
- case D_L0_4x8:
- x264_mb_mc_0xywh( h, x+0, y, 1, 2 );
- x264_mb_mc_0xywh( h, x+1, y, 1, 2 );
- break;
- case D_L0_4x4:
- x264_mb_mc_0xywh( h, x+0, y+0, 1, 1 );
- x264_mb_mc_0xywh( h, x+1, y+0, 1, 1 );
- x264_mb_mc_0xywh( h, x+0, y+1, 1, 1 );
- x264_mb_mc_0xywh( h, x+1, y+1, 1, 1 );
- break;
- case D_L1_8x8:
+ int scan8 = x264_scan8[0] + x + 8*y;
+
+ if( h->mb.cache.ref[0][scan8] >= 0 )
+ if( h->mb.cache.ref[1][scan8] >= 0 )
+ x264_mb_mc_01xywh( h, x, y, 2, 2 );
+ else
+ x264_mb_mc_0xywh( h, x, y, 2, 2 );
+ else
x264_mb_mc_1xywh( h, x, y, 2, 2 );
- break;
- case D_BI_8x8:
- x264_mb_mc_01xywh( h, x, y, 2, 2 );
- break;
- case D_DIRECT_8x8:
- x264_mb_mc_direct8x8( h, x, y );
- break;
}
}
void x264_mb_mc( x264_t *h )
{
- if( h->mb.i_type == P_L0 )
+ if( h->mb.i_partition == D_8x8 )
{
- if( h->mb.i_partition == D_16x16 )
- {
- x264_mb_mc_0xywh( h, 0, 0, 4, 4 );
- }
- else if( h->mb.i_partition == D_16x8 )
- {
- x264_mb_mc_0xywh( h, 0, 0, 4, 2 );
- x264_mb_mc_0xywh( h, 0, 2, 4, 2 );
- }
- else if( h->mb.i_partition == D_8x16 )
- {
- x264_mb_mc_0xywh( h, 0, 0, 2, 4 );
- x264_mb_mc_0xywh( h, 2, 0, 2, 4 );
- }
- }
- else if( h->mb.i_type == P_8x8 || h->mb.i_type == B_8x8 )
- {
- int i;
- for( i = 0; i < 4; i++ )
+ for( int i = 0; i < 4; i++ )
x264_mb_mc_8x8( h, i );
}
- else if( h->mb.i_type == B_SKIP || h->mb.i_type == B_DIRECT )
- {
- x264_mb_mc_direct8x8( h, 0, 0 );
- x264_mb_mc_direct8x8( h, 2, 0 );
- x264_mb_mc_direct8x8( h, 0, 2 );
- x264_mb_mc_direct8x8( h, 2, 2 );
- }
- else /* B_*x* */
+ else
{
- const uint8_t *b_list0 = x264_mb_type_list_table[h->mb.i_type][0];
- const uint8_t *b_list1 = x264_mb_type_list_table[h->mb.i_type][1];
+ int ref0a = h->mb.cache.ref[0][x264_scan8[ 0]];
+ int ref0b = h->mb.cache.ref[0][x264_scan8[12]];
+ int ref1a = h->mb.cache.ref[1][x264_scan8[ 0]];
+ int ref1b = h->mb.cache.ref[1][x264_scan8[12]];
if( h->mb.i_partition == D_16x16 )
{
- if( b_list0[0] && b_list1[0] ) x264_mb_mc_01xywh( h, 0, 0, 4, 4 );
- else if( b_list0[0] ) x264_mb_mc_0xywh ( h, 0, 0, 4, 4 );
- else if( b_list1[0] ) x264_mb_mc_1xywh ( h, 0, 0, 4, 4 );
+ if( ref0a >= 0 )
+ if( ref1a >= 0 ) x264_mb_mc_01xywh( h, 0, 0, 4, 4 );
+ else x264_mb_mc_0xywh ( h, 0, 0, 4, 4 );
+ else x264_mb_mc_1xywh ( h, 0, 0, 4, 4 );
}
else if( h->mb.i_partition == D_16x8 )
{
- if( b_list0[0] && b_list1[0] ) x264_mb_mc_01xywh( h, 0, 0, 4, 2 );
- else if( b_list0[0] ) x264_mb_mc_0xywh ( h, 0, 0, 4, 2 );
- else if( b_list1[0] ) x264_mb_mc_1xywh ( h, 0, 0, 4, 2 );
-
- if( b_list0[1] && b_list1[1] ) x264_mb_mc_01xywh( h, 0, 2, 4, 2 );
- else if( b_list0[1] ) x264_mb_mc_0xywh ( h, 0, 2, 4, 2 );
- else if( b_list1[1] ) x264_mb_mc_1xywh ( h, 0, 2, 4, 2 );
+ if( ref0a >= 0 )
+ if( ref1a >= 0 ) x264_mb_mc_01xywh( h, 0, 0, 4, 2 );
+ else x264_mb_mc_0xywh ( h, 0, 0, 4, 2 );
+ else x264_mb_mc_1xywh ( h, 0, 0, 4, 2 );
+
+ if( ref0b >= 0 )
+ if( ref1b >= 0 ) x264_mb_mc_01xywh( h, 0, 2, 4, 2 );
+ else x264_mb_mc_0xywh ( h, 0, 2, 4, 2 );
+ else x264_mb_mc_1xywh ( h, 0, 2, 4, 2 );
}
else if( h->mb.i_partition == D_8x16 )
{
- if( b_list0[0] && b_list1[0] ) x264_mb_mc_01xywh( h, 0, 0, 2, 4 );
- else if( b_list0[0] ) x264_mb_mc_0xywh ( h, 0, 0, 2, 4 );
- else if( b_list1[0] ) x264_mb_mc_1xywh ( h, 0, 0, 2, 4 );
-
- if( b_list0[1] && b_list1[1] ) x264_mb_mc_01xywh( h, 2, 0, 2, 4 );
- else if( b_list0[1] ) x264_mb_mc_0xywh ( h, 2, 0, 2, 4 );
- else if( b_list1[1] ) x264_mb_mc_1xywh ( h, 2, 0, 2, 4 );
+ if( ref0a >= 0 )
+ if( ref1a >= 0 ) x264_mb_mc_01xywh( h, 0, 0, 2, 4 );
+ else x264_mb_mc_0xywh ( h, 0, 0, 2, 4 );
+ else x264_mb_mc_1xywh ( h, 0, 0, 2, 4 );
+
+ if( ref0b >= 0 )
+ if( ref1b >= 0 ) x264_mb_mc_01xywh( h, 2, 0, 2, 4 );
+ else x264_mb_mc_0xywh ( h, 2, 0, 2, 4 );
+ else x264_mb_mc_1xywh ( h, 2, 0, 2, 4 );
}
}
}
-int x264_macroblock_cache_init( x264_t *h )
+int x264_macroblock_cache_allocate( x264_t *h )
{
- int i, j;
int i_mb_count = h->mb.i_mb_count;
- h->mb.i_mb_stride = h->sps->i_mb_width;
- h->mb.i_b8_stride = h->sps->i_mb_width * 2;
- h->mb.i_b4_stride = h->sps->i_mb_width * 4;
+ h->mb.i_mb_stride = h->mb.i_mb_width;
+ h->mb.i_b8_stride = h->mb.i_mb_width * 2;
+ h->mb.i_b4_stride = h->mb.i_mb_width * 4;
h->mb.b_interlaced = h->param.b_interlaced;
CHECKED_MALLOC( h->mb.cbp, i_mb_count * sizeof(int16_t) );
CHECKED_MALLOC( h->mb.skipbp, i_mb_count * sizeof(int8_t) );
CHECKED_MALLOC( h->mb.mb_transform_size, i_mb_count * sizeof(int8_t) );
+ CHECKED_MALLOC( h->mb.slice_table, i_mb_count * sizeof(uint16_t) );
+ memset( h->mb.slice_table, -1, i_mb_count * sizeof(uint16_t) );
/* 0 -> 3 top(4), 4 -> 6 : left(3) */
CHECKED_MALLOC( h->mb.intra4x4_pred_mode, i_mb_count * 8 * sizeof(int8_t) );
/* all coeffs */
CHECKED_MALLOC( h->mb.non_zero_count, i_mb_count * 24 * sizeof(uint8_t) );
- CHECKED_MALLOC( h->mb.nnz_backup, h->sps->i_mb_width * 4 * 16 * sizeof(uint8_t) );
if( h->param.b_cabac )
{
CHECKED_MALLOC( h->mb.chroma_pred_mode, i_mb_count * sizeof(int8_t) );
- CHECKED_MALLOC( h->mb.mvd[0], 2*16 * i_mb_count * sizeof(int16_t) );
- CHECKED_MALLOC( h->mb.mvd[1], 2*16 * i_mb_count * sizeof(int16_t) );
+ CHECKED_MALLOC( h->mb.mvd[0], i_mb_count * sizeof( **h->mb.mvd ) );
+ CHECKED_MALLOC( h->mb.mvd[1], i_mb_count * sizeof( **h->mb.mvd ) );
}
- for( i=0; i<2; i++ )
+ for( int i = 0; i < 2; i++ )
{
- int i_refs = X264_MIN(16, (i ? 1 : h->param.i_frame_reference) + h->param.b_bframe_pyramid) << h->param.b_interlaced;
- for( j=0; j < i_refs; j++ )
- CHECKED_MALLOC( h->mb.mvr[i][j], 2 * i_mb_count * sizeof(int16_t) );
- }
+ int i_refs = X264_MIN(16, (i ? 1 + !!h->param.i_bframe_pyramid : h->param.i_frame_reference) ) << h->param.b_interlaced;
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART )
+ i_refs = X264_MIN(16, i_refs + 2); //smart weights add two duplicate frames
+ else if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_BLIND )
+ i_refs = X264_MIN(16, i_refs + 1); //blind weights add one duplicate frame
- for( i=0; i<=h->param.b_interlaced; i++ )
- for( j=0; j<3; j++ )
+ for( int j = !i; j < i_refs; j++ )
{
- CHECKED_MALLOC( h->mb.intra_border_backup[i][j], h->fdec->i_stride[j] );
- h->mb.intra_border_backup[i][j] += 8;
+ CHECKED_MALLOC( h->mb.mvr[i][j], 2 * (i_mb_count + 1) * sizeof(int16_t) );
+ M32( h->mb.mvr[i][j][0] ) = 0;
+ h->mb.mvr[i][j]++;
}
+ }
- /* init with not available (for top right idx=7,15) */
- memset( h->mb.cache.ref[0], -2, X264_SCAN8_SIZE * sizeof( int8_t ) );
- memset( h->mb.cache.ref[1], -2, X264_SCAN8_SIZE * sizeof( int8_t ) );
+ if( h->param.analyse.i_weighted_pred )
+ {
+ int i_padv = PADV << h->param.b_interlaced;
+ int align = h->param.cpu&X264_CPU_CACHELINE_64 ? 64 : h->param.cpu&X264_CPU_CACHELINE_32 ? 32 : 16;
+ int i_stride, luma_plane_size = 0;
+ int numweightbuf;
- /* fdec: fenc:
- * yyyyyyy
- * yYYYY YYYY
- * yYYYY YYYY
- * yYYYY YYYY
- * yYYYY YYYY
- * uuu vvv UUVV
- * uUU vVV UUVV
- * uUU vVV
- */
- h->mb.pic.p_fenc[0] = h->mb.pic.fenc_buf;
- h->mb.pic.p_fenc[1] = h->mb.pic.fenc_buf + 16*FENC_STRIDE;
- h->mb.pic.p_fenc[2] = h->mb.pic.fenc_buf + 16*FENC_STRIDE + 8;
- h->mb.pic.p_fdec[0] = h->mb.pic.fdec_buf + 2*FDEC_STRIDE;
- h->mb.pic.p_fdec[1] = h->mb.pic.fdec_buf + 19*FDEC_STRIDE;
- h->mb.pic.p_fdec[2] = h->mb.pic.fdec_buf + 19*FDEC_STRIDE + 16;
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_FAKE )
+ {
+ // only need buffer for lookahead
+ if( !h->param.i_sync_lookahead || h == h->thread[h->param.i_threads] )
+ {
+ // Fake analysis only works on lowres
+ i_stride = ALIGN( h->mb.i_mb_width*8 + 2*PADH, align );
+ luma_plane_size = i_stride * (h->mb.i_mb_height*8+2*i_padv);
+ // Only need 1 buffer for analysis
+ numweightbuf = 1;
+ }
+ else
+ numweightbuf = 0;
+ }
+ else
+ {
+ i_stride = ALIGN( h->mb.i_mb_width*16 + 2*PADH, align );
+ luma_plane_size = i_stride * (h->mb.i_mb_height*16+2*i_padv);
- h->mb.i_neighbour4[6] =
- h->mb.i_neighbour4[9] =
- h->mb.i_neighbour4[12] =
- h->mb.i_neighbour4[14] = MB_LEFT|MB_TOP|MB_TOPLEFT|MB_TOPRIGHT;
- h->mb.i_neighbour4[3] =
- h->mb.i_neighbour4[7] =
- h->mb.i_neighbour4[11] =
- h->mb.i_neighbour4[13] =
- h->mb.i_neighbour4[15] =
- h->mb.i_neighbour8[3] = MB_LEFT|MB_TOP|MB_TOPLEFT;
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART )
+ //SMART can weight one ref and one offset -1
+ numweightbuf = 2;
+ else
+ //blind only has one weighted copy (offset -1)
+ numweightbuf = 1;
+ }
- int buf_hpel = (h->param.i_width+48) * sizeof(int16_t);
- int buf_ssim = h->param.analyse.b_ssim * 8 * (h->param.i_width/4+3) * sizeof(int);
- int me_range = X264_MIN(h->param.analyse.i_me_range, h->param.analyse.i_mv_range);
- int buf_tesa = (h->param.analyse.i_me_method >= X264_ME_ESA) *
- ((me_range*2+18) * sizeof(int16_t) + (me_range+4) * (me_range+1) * 4 * sizeof(mvsad_t));
- int buf_mbtree = h->param.rc.b_mb_tree * ((h->sps->i_mb_width+3)&~3) * sizeof(int);
- CHECKED_MALLOC( h->scratch_buffer, X264_MAX4( buf_hpel, buf_ssim, buf_tesa, buf_mbtree ) );
+ for( int i = 0; i < numweightbuf; i++ )
+ CHECKED_MALLOC( h->mb.p_weight_buf[i], luma_plane_size * sizeof(pixel) );
+ }
return 0;
-fail: return -1;
+fail:
+ return -1;
}
-void x264_macroblock_cache_end( x264_t *h )
+void x264_macroblock_cache_free( x264_t *h )
{
- int i, j;
- for( i=0; i<=h->param.b_interlaced; i++ )
- for( j=0; j<3; j++ )
- x264_free( h->mb.intra_border_backup[i][j] - 8 );
- for( i=0; i<2; i++ )
- for( j=0; j<32; j++ )
- x264_free( h->mb.mvr[i][j] );
+ for( int i = 0; i < 2; i++ )
+ for( int j = !i; j < 32; j++ )
+ if( h->mb.mvr[i][j] )
+ x264_free( h->mb.mvr[i][j]-1 );
+ for( int i = 0; i < 16; i++ )
+ x264_free( h->mb.p_weight_buf[i] );
+
if( h->param.b_cabac )
{
x264_free( h->mb.chroma_pred_mode );
x264_free( h->mb.mvd[0] );
x264_free( h->mb.mvd[1] );
}
+ x264_free( h->mb.slice_table );
x264_free( h->mb.intra4x4_pred_mode );
x264_free( h->mb.non_zero_count );
- x264_free( h->mb.nnz_backup );
x264_free( h->mb.mb_transform_size );
x264_free( h->mb.skipbp );
x264_free( h->mb.cbp );
x264_free( h->mb.qp );
+}
+
+int x264_macroblock_thread_allocate( x264_t *h, int b_lookahead )
+{
+ if( !b_lookahead )
+ for( int i = 0; i <= h->param.b_interlaced; i++ )
+ {
+ for( int j = 0; j < 3; j++ )
+ {
+ /* shouldn't really be initialized, just silences a valgrind false-positive in predict_8x8_filter_mmx */
+ CHECKED_MALLOCZERO( h->intra_border_backup[i][j], ((h->mb.i_mb_width*16+32)>>!!j) * sizeof(pixel) );
+ h->intra_border_backup[i][j] += 8;
+ }
+ CHECKED_MALLOC( h->deblock_strength[i], sizeof(**h->deblock_strength) * h->mb.i_mb_width );
+ }
+
+ /* Allocate scratch buffer */
+ int scratch_size = 0;
+ if( !b_lookahead )
+ {
+ int buf_hpel = (h->thread[0]->fdec->i_width[0]+48) * sizeof(dctcoef);
+ int buf_ssim = h->param.analyse.b_ssim * 8 * (h->param.i_width/4+3) * sizeof(int);
+ int me_range = X264_MIN(h->param.analyse.i_me_range, h->param.analyse.i_mv_range);
+ int buf_tesa = (h->param.analyse.i_me_method >= X264_ME_ESA) *
+ ((me_range*2+24) * sizeof(int16_t) + (me_range+4) * (me_range+1) * 4 * sizeof(mvsad_t));
+ scratch_size = X264_MAX3( buf_hpel, buf_ssim, buf_tesa );
+ }
+ int buf_mbtree = h->param.rc.b_mb_tree * ((h->mb.i_mb_width+3)&~3) * sizeof(int);
+ scratch_size = X264_MAX( scratch_size, buf_mbtree );
+ CHECKED_MALLOC( h->scratch_buffer, scratch_size );
+
+ return 0;
+fail:
+ return -1;
+}
+
+void x264_macroblock_thread_free( x264_t *h, int b_lookahead )
+{
+ if( !b_lookahead )
+ for( int i = 0; i <= h->param.b_interlaced; i++ )
+ {
+ x264_free( h->deblock_strength[i] );
+ for( int j = 0; j < 3; j++ )
+ x264_free( h->intra_border_backup[i][j] - 8 );
+ }
x264_free( h->scratch_buffer );
}
+
void x264_macroblock_slice_init( x264_t *h )
{
- int i, j;
-
h->mb.mv[0] = h->fdec->mv[0];
h->mb.mv[1] = h->fdec->mv[1];
+ h->mb.mvr[0][0] = h->fdec->mv16x16;
h->mb.ref[0] = h->fdec->ref[0];
h->mb.ref[1] = h->fdec->ref[1];
h->mb.type = h->fdec->mb_type;
+ h->mb.partition = h->fdec->mb_partition;
h->fdec->i_ref[0] = h->i_ref0;
h->fdec->i_ref[1] = h->i_ref1;
- for( i = 0; i < h->i_ref0; i++ )
+ for( int i = 0; i < h->i_ref0; i++ )
h->fdec->ref_poc[0][i] = h->fref0[i]->i_poc;
if( h->sh.i_type == SLICE_TYPE_B )
{
- for( i = 0; i < h->i_ref1; i++ )
+ for( int i = 0; i < h->i_ref1; i++ )
h->fdec->ref_poc[1][i] = h->fref1[i]->i_poc;
- h->mb.map_col_to_list0[-1] = -1;
- h->mb.map_col_to_list0[-2] = -2;
- for( i = 0; i < h->fref1[0]->i_ref[0]; i++ )
+ map_col_to_list0(-1) = -1;
+ map_col_to_list0(-2) = -2;
+ for( int i = 0; i < h->fref1[0]->i_ref[0]; i++ )
{
int poc = h->fref1[0]->ref_poc[0][i];
- h->mb.map_col_to_list0[i] = -2;
- for( j = 0; j < h->i_ref0; j++ )
+ map_col_to_list0(i) = -2;
+ for( int j = 0; j < h->i_ref0; j++ )
if( h->fref0[j]->i_poc == poc )
{
- h->mb.map_col_to_list0[i] = j;
+ map_col_to_list0(i) = j;
break;
}
}
}
- if( h->sh.i_type == SLICE_TYPE_P )
- memset( h->mb.cache.skip, 0, X264_SCAN8_SIZE * sizeof( int8_t ) );
+ else if( h->sh.i_type == SLICE_TYPE_P )
+ {
+ memset( h->mb.cache.skip, 0, sizeof( h->mb.cache.skip ) );
+
+ if( h->sh.i_disable_deblocking_filter_idc != 1 && h->param.analyse.i_weighted_pred )
+ {
+ deblock_ref_table(-2) = -2;
+ deblock_ref_table(-1) = -1;
+ for( int i = 0; i < h->i_ref0 << h->sh.b_mbaff; i++ )
+ {
+ /* Mask off high bits to avoid frame num collisions with -1/-2.
+ * In current x264 frame num values don't cover a range of more
+ * than 32, so 6 bits is enough for uniqueness. */
+ if( !h->mb.b_interlaced )
+ deblock_ref_table(i) = h->fref0[i]->i_frame_num&63;
+ else
+ deblock_ref_table(i) = ((h->fref0[i>>1]->i_frame_num&63)<<1) + (i&1);
+ }
+ }
+ }
+
+ /* init with not available (for top right idx=7,15) */
+ memset( h->mb.cache.ref, -2, sizeof( h->mb.cache.ref ) );
+
+ if( h->i_ref0 > 0 )
+ for( int field = 0; field <= h->sh.b_mbaff; field++ )
+ {
+ int curpoc = h->fdec->i_poc + field*h->sh.i_delta_poc_bottom;
+ int refpoc = h->fref0[0]->i_poc;
+ if( h->sh.b_mbaff && field )
+ refpoc += h->sh.i_delta_poc_bottom;
+ int delta = curpoc - refpoc;
- setup_inverse_delta_pocs( h );
+ h->fdec->inv_ref_poc[field] = (256 + delta/2) / delta;
+ }
+
+ h->mb.i_neighbour4[6] =
+ h->mb.i_neighbour4[9] =
+ h->mb.i_neighbour4[12] =
+ h->mb.i_neighbour4[14] = MB_LEFT|MB_TOP|MB_TOPLEFT|MB_TOPRIGHT;
+ h->mb.i_neighbour4[3] =
+ h->mb.i_neighbour4[7] =
+ h->mb.i_neighbour4[11] =
+ h->mb.i_neighbour4[13] =
+ h->mb.i_neighbour4[15] =
+ h->mb.i_neighbour8[3] = MB_LEFT|MB_TOP|MB_TOPLEFT;
+}
+
+void x264_macroblock_thread_init( x264_t *h )
+{
+ h->mb.i_me_method = h->param.analyse.i_me_method;
+ h->mb.i_subpel_refine = h->param.analyse.i_subpel_refine;
+ if( h->sh.i_type == SLICE_TYPE_B && (h->mb.i_subpel_refine == 6 || h->mb.i_subpel_refine == 8) )
+ h->mb.i_subpel_refine--;
+ h->mb.b_chroma_me = h->param.analyse.b_chroma_me && h->sh.i_type == SLICE_TYPE_P
+ && h->mb.i_subpel_refine >= 5;
+ h->mb.b_dct_decimate = h->sh.i_type == SLICE_TYPE_B ||
+ (h->param.analyse.b_dct_decimate && h->sh.i_type != SLICE_TYPE_I);
+
+
+ /* fdec: fenc:
+ * yyyyyyy
+ * yYYYY YYYY
+ * yYYYY YYYY
+ * yYYYY YYYY
+ * yYYYY YYYY
+ * uuu vvv UUVV
+ * uUU vVV UUVV
+ * uUU vVV
+ */
+ h->mb.pic.p_fenc[0] = h->mb.pic.fenc_buf;
+ h->mb.pic.p_fenc[1] = h->mb.pic.fenc_buf + 16*FENC_STRIDE;
+ h->mb.pic.p_fenc[2] = h->mb.pic.fenc_buf + 16*FENC_STRIDE + 8;
+ h->mb.pic.p_fdec[0] = h->mb.pic.fdec_buf + 2*FDEC_STRIDE;
+ h->mb.pic.p_fdec[1] = h->mb.pic.fdec_buf + 19*FDEC_STRIDE;
+ h->mb.pic.p_fdec[2] = h->mb.pic.fdec_buf + 19*FDEC_STRIDE + 16;
}
void x264_prefetch_fenc( x264_t *h, x264_frame_t *fenc, int i_mb_x, int i_mb_y )
fenc->plane[1+(i_mb_x&1)]+off_uv, stride_uv, i_mb_x );
}
-static NOINLINE void copy_column8( uint8_t *dst, uint8_t *src )
+static NOINLINE void copy_column8( pixel *dst, pixel *src )
{
// input pointers are offset by 4 rows because that's faster (smaller instruction size on x86)
- int i;
- for( i = -4; i < 4; i++ )
+ for( int i = -4; i < 4; i++ )
dst[i*FDEC_STRIDE] = src[i*FDEC_STRIDE];
}
-static void ALWAYS_INLINE x264_macroblock_load_pic_pointers( x264_t *h, int i_mb_x, int i_mb_y, int i)
+static void ALWAYS_INLINE x264_macroblock_load_pic_pointers( x264_t *h, int mb_x, int mb_y, int i, int b_interlaced )
{
const int w = (i == 0 ? 16 : 8);
const int i_stride = h->fdec->i_stride[!!i];
- const int i_stride2 = i_stride << h->mb.b_interlaced;
- const int i_pix_offset = h->mb.b_interlaced
- ? w * (i_mb_x + (i_mb_y&~1) * i_stride) + (i_mb_y&1) * i_stride
- : w * (i_mb_x + i_mb_y * i_stride);
+ const int i_stride2 = i_stride << b_interlaced;
+ const int i_pix_offset = b_interlaced
+ ? w * (mb_x + (mb_y&~1) * i_stride) + (mb_y&1) * i_stride
+ : w * (mb_x + mb_y * i_stride);
+ const pixel *plane_fdec = &h->fdec->plane[i][i_pix_offset];
+ const pixel *intra_fdec = &h->intra_border_backup[mb_y & h->sh.b_mbaff][i][mb_x*16>>!!i];
int ref_pix_offset[2] = { i_pix_offset, i_pix_offset };
- const uint8_t *intra_fdec = &h->mb.intra_border_backup[i_mb_y & h->sh.b_mbaff][i][i_mb_x*16>>!!i];
x264_frame_t **fref[2] = { h->fref0, h->fref1 };
- int j, k;
- if( h->mb.b_interlaced )
- ref_pix_offset[1] += (1-2*(i_mb_y&1)) * i_stride;
+ if( b_interlaced )
+ ref_pix_offset[1] += (1-2*(mb_y&1)) * i_stride;
h->mb.pic.i_stride[i] = i_stride2;
h->mb.pic.p_fenc_plane[i] = &h->fenc->plane[i][i_pix_offset];
h->mc.copy[i?PIXEL_8x8:PIXEL_16x16]( h->mb.pic.p_fenc[i], FENC_STRIDE,
h->mb.pic.p_fenc_plane[i], i_stride2, w );
- memcpy( &h->mb.pic.p_fdec[i][-1-FDEC_STRIDE], intra_fdec-1, w*3/2+1 );
- if( h->mb.b_interlaced )
- {
- const uint8_t *plane_fdec = &h->fdec->plane[i][i_pix_offset];
- for( j = 0; j < w; j++ )
+ memcpy( &h->mb.pic.p_fdec[i][-1-FDEC_STRIDE], intra_fdec-1, (w*3/2+1) * sizeof(pixel) );
+ if( b_interlaced )
+ for( int j = 0; j < w; j++ )
h->mb.pic.p_fdec[i][-1+j*FDEC_STRIDE] = plane_fdec[-1+j*i_stride2];
- }
- for( j = 0; j < h->mb.pic.i_fref[0]; j++ )
+ for( int j = 0; j < h->mb.pic.i_fref[0]; j++ )
{
- h->mb.pic.p_fref[0][j][i==0 ? 0:i+3] = &fref[0][j >> h->mb.b_interlaced]->plane[i][ref_pix_offset[j&1]];
+ h->mb.pic.p_fref[0][j][i==0 ? 0:i+3] = &fref[0][j >> b_interlaced]->plane[i][ref_pix_offset[j&1]];
if( i == 0 )
- for( k = 1; k < 4; k++ )
- h->mb.pic.p_fref[0][j][k] = &fref[0][j >> h->mb.b_interlaced]->filtered[k][ref_pix_offset[j&1]];
+ {
+ for( int k = 1; k < 4; k++ )
+ h->mb.pic.p_fref[0][j][k] = &fref[0][j >> b_interlaced]->filtered[k][ref_pix_offset[j&1]];
+ if( h->sh.weight[j][0].weightfn )
+ h->mb.pic.p_fref_w[j] = &h->fenc->weighted[j >> b_interlaced][ref_pix_offset[j&1]];
+ else
+ h->mb.pic.p_fref_w[j] = h->mb.pic.p_fref[0][j][0];
+ }
}
if( h->sh.i_type == SLICE_TYPE_B )
- for( j = 0; j < h->mb.pic.i_fref[1]; j++ )
+ for( int j = 0; j < h->mb.pic.i_fref[1]; j++ )
{
- h->mb.pic.p_fref[1][j][i==0 ? 0:i+3] = &fref[1][j >> h->mb.b_interlaced]->plane[i][ref_pix_offset[j&1]];
+ h->mb.pic.p_fref[1][j][i==0 ? 0:i+3] = &fref[1][j >> b_interlaced]->plane[i][ref_pix_offset[j&1]];
if( i == 0 )
- for( k = 1; k < 4; k++ )
- h->mb.pic.p_fref[1][j][k] = &fref[1][j >> h->mb.b_interlaced]->filtered[k][ref_pix_offset[j&1]];
+ for( int k = 1; k < 4; k++ )
+ h->mb.pic.p_fref[1][j][k] = &fref[1][j >> b_interlaced]->filtered[k][ref_pix_offset[j&1]];
}
}
-void x264_macroblock_cache_load( x264_t *h, int i_mb_x, int i_mb_y )
+static void inline x264_macroblock_cache_load_neighbours( x264_t *h, int mb_x, int mb_y )
{
- int i_mb_xy = i_mb_y * h->mb.i_mb_stride + i_mb_x;
- int i_mb_4x4 = 4*(i_mb_y * h->mb.i_b4_stride + i_mb_x);
- int i_mb_8x8 = 2*(i_mb_y * h->mb.i_b8_stride + i_mb_x);
- int i_top_y = i_mb_y - (1 << h->mb.b_interlaced);
- int i_top_xy = i_top_y * h->mb.i_mb_stride + i_mb_x;
- int i_top_4x4 = (4*i_top_y+3) * h->mb.i_b4_stride + 4*i_mb_x;
- int i_top_8x8 = (2*i_top_y+1) * h->mb.i_b8_stride + 2*i_mb_x;
- int i_left_xy = -1;
- int i_top_type = -1; /* gcc warn */
- int i_left_type= -1;
-
- int i;
-
- /* init index */
- h->mb.i_mb_x = i_mb_x;
- h->mb.i_mb_y = i_mb_y;
- h->mb.i_mb_xy = i_mb_xy;
- h->mb.i_b8_xy = i_mb_8x8;
- h->mb.i_b4_xy = i_mb_4x4;
- h->mb.i_mb_top_xy = i_top_xy;
+ int top = (mb_y - (1 << h->mb.b_interlaced)) * h->mb.i_mb_stride + mb_x;
+
+ h->mb.i_mb_x = mb_x;
+ h->mb.i_mb_y = mb_y;
+ h->mb.i_mb_xy = mb_y * h->mb.i_mb_stride + mb_x;
+ h->mb.i_b8_xy = 2*(mb_y * h->mb.i_b8_stride + mb_x);
+ h->mb.i_b4_xy = 4*(mb_y * h->mb.i_b4_stride + mb_x);
h->mb.i_neighbour = 0;
+ h->mb.i_neighbour_intra = 0;
+ h->mb.i_neighbour_frame = 0;
+ h->mb.i_mb_top_xy = -1;
+ h->mb.i_mb_left_xy = -1;
+ h->mb.i_mb_topleft_xy = -1;
+ h->mb.i_mb_topright_xy = -1;
+ h->mb.i_mb_type_top = -1;
+ h->mb.i_mb_type_left = -1;
+ h->mb.i_mb_type_topleft = -1;
+ h->mb.i_mb_type_topright = -1;
+
+ if( mb_x > 0 )
+ {
+ h->mb.i_neighbour_frame |= MB_LEFT;
+ h->mb.i_mb_left_xy = h->mb.i_mb_xy - 1;
+ h->mb.i_mb_type_left = h->mb.type[h->mb.i_mb_left_xy];
+ if( h->mb.i_mb_xy > h->sh.i_first_mb )
+ {
+ h->mb.i_neighbour |= MB_LEFT;
- /* load cache */
- if( i_top_xy >= h->sh.i_first_mb )
+ if( !h->param.b_constrained_intra || IS_INTRA( h->mb.i_mb_type_left ) )
+ h->mb.i_neighbour_intra |= MB_LEFT;
+ }
+ }
+
+ /* We can't predict from the previous threadslice since it hasn't been encoded yet. */
+ if( (h->i_threadslice_start >> h->mb.b_interlaced) != (mb_y >> h->mb.b_interlaced) )
{
- h->mb.i_mb_type_top =
- i_top_type= h->mb.type[i_top_xy];
- h->mb.cache.i_cbp_top = h->mb.cbp[i_top_xy];
+ if( top >= 0 )
+ {
+ h->mb.i_neighbour_frame |= MB_TOP;
+ h->mb.i_mb_top_xy = top;
+ h->mb.i_mb_type_top = h->mb.type[h->mb.i_mb_top_xy];
+ if( top >= h->sh.i_first_mb )
+ {
+ h->mb.i_neighbour |= MB_TOP;
+
+ if( !h->param.b_constrained_intra || IS_INTRA( h->mb.i_mb_type_top ) )
+ h->mb.i_neighbour_intra |= MB_TOP;
+
+ /* We only need to prefetch the top blocks because the left was just written
+ * to as part of the previous cache_save. Since most target CPUs use write-allocate
+ * caches, left blocks are near-guaranteed to be in L1 cache. Top--not so much. */
+ x264_prefetch( &h->mb.cbp[top] );
+ x264_prefetch( h->mb.intra4x4_pred_mode[top] );
+ x264_prefetch( &h->mb.non_zero_count[top][12] );
+ /* These aren't always allocated, but prefetching an invalid address can't hurt. */
+ x264_prefetch( &h->mb.mb_transform_size[top] );
+ x264_prefetch( &h->mb.skipbp[top] );
+ }
+ }
+
+ if( mb_x > 0 && top - 1 >= 0 )
+ {
+ h->mb.i_neighbour_frame |= MB_TOPLEFT;
+ h->mb.i_mb_topleft_xy = top - 1;
+ h->mb.i_mb_type_topleft = h->mb.type[h->mb.i_mb_topleft_xy];
+ if( top - 1 >= h->sh.i_first_mb )
+ {
+ h->mb.i_neighbour |= MB_TOPLEFT;
+
+ if( !h->param.b_constrained_intra || IS_INTRA( h->mb.i_mb_type_topleft ) )
+ h->mb.i_neighbour_intra |= MB_TOPLEFT;
+ }
+ }
+
+ if( mb_x < h->mb.i_mb_width - 1 && top + 1 >= 0 )
+ {
+ h->mb.i_neighbour_frame |= MB_TOPRIGHT;
+ h->mb.i_mb_topright_xy = top + 1;
+ h->mb.i_mb_type_topright = h->mb.type[h->mb.i_mb_topright_xy];
+ if( top + 1 >= h->sh.i_first_mb )
+ {
+ h->mb.i_neighbour |= MB_TOPRIGHT;
+
+ if( !h->param.b_constrained_intra || IS_INTRA( h->mb.i_mb_type_topright ) )
+ h->mb.i_neighbour_intra |= MB_TOPRIGHT;
+ }
+ }
+ }
+}
- h->mb.i_neighbour |= MB_TOP;
+void x264_macroblock_cache_load( x264_t *h, int mb_x, int mb_y )
+{
+ x264_macroblock_cache_load_neighbours( h, mb_x, mb_y );
+
+ int left = h->mb.i_mb_left_xy;
+ int top = h->mb.i_mb_top_xy;
+ int top_y = mb_y - (1 << h->mb.b_interlaced);
+ int s8x8 = h->mb.i_b8_stride;
+ int s4x4 = h->mb.i_b4_stride;
+ int top_8x8 = (2*top_y+1) * s8x8 + 2*mb_x;
+ int top_4x4 = (4*top_y+3) * s4x4 + 4*mb_x;
+ int lists = (1 << h->sh.i_type) & 3;
+
+ /* GCC pessimizes direct loads from heap-allocated arrays due to aliasing. */
+ /* By only dereferencing them once, we avoid this issue. */
+ int8_t (*i4x4)[8] = h->mb.intra4x4_pred_mode;
+ uint8_t (*nnz)[24] = h->mb.non_zero_count;
+ int16_t *cbp = h->mb.cbp;
+ /* load cache */
+ if( h->mb.i_neighbour & MB_TOP )
+ {
+ h->mb.cache.i_cbp_top = cbp[top];
/* load intra4x4 */
- *(uint32_t*)&h->mb.cache.intra4x4_pred_mode[x264_scan8[0] - 8] = *(uint32_t*)&h->mb.intra4x4_pred_mode[i_top_xy][0];
+ CP32( &h->mb.cache.intra4x4_pred_mode[x264_scan8[0] - 8], &i4x4[top][0] );
/* load non_zero_count */
- *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[0] - 8] = *(uint32_t*)&h->mb.non_zero_count[i_top_xy][12];
+ CP32( &h->mb.cache.non_zero_count[x264_scan8[0] - 8], &nnz[top][12] );
/* shift because x264_scan8[16] is misaligned */
- *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[16] - 9] = *(uint16_t*)&h->mb.non_zero_count[i_top_xy][18] << 8;
- *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[16+4] - 9] = *(uint16_t*)&h->mb.non_zero_count[i_top_xy][22] << 8;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[16+0] - 9] ) = M16( &nnz[top][18] ) << 8;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[16+4] - 9] ) = M16( &nnz[top][22] ) << 8;
}
else
{
- h->mb.i_mb_type_top = -1;
h->mb.cache.i_cbp_top = -1;
/* load intra4x4 */
- h->mb.cache.intra4x4_pred_mode[x264_scan8[0] - 8] =
- h->mb.cache.intra4x4_pred_mode[x264_scan8[1] - 8] =
- h->mb.cache.intra4x4_pred_mode[x264_scan8[4] - 8] =
- h->mb.cache.intra4x4_pred_mode[x264_scan8[5] - 8] = -1;
+ M32( &h->mb.cache.intra4x4_pred_mode[x264_scan8[0] - 8] ) = 0xFFFFFFFFU;
/* load non_zero_count */
- h->mb.cache.non_zero_count[x264_scan8[0] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[1] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[4] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[5] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[16+0] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[16+1] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[16+4+0] - 8] =
- h->mb.cache.non_zero_count[x264_scan8[16+4+1] - 8] = 0x80;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[ 0] - 8] ) = 0x80808080U;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[16+0] - 9] ) = 0x80808080U;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[16+4] - 9] ) = 0x80808080U;
}
- if( i_mb_x > 0 && i_mb_xy > h->sh.i_first_mb )
+ if( h->mb.i_neighbour & MB_LEFT )
{
- i_left_xy = i_mb_xy - 1;
- h->mb.i_mb_type_left =
- i_left_type = h->mb.type[i_left_xy];
- h->mb.cache.i_cbp_left = h->mb.cbp[h->mb.i_mb_xy - 1];
-
- h->mb.i_neighbour |= MB_LEFT;
+ h->mb.cache.i_cbp_left = cbp[left];
/* load intra4x4 */
- h->mb.cache.intra4x4_pred_mode[x264_scan8[0 ] - 1] = h->mb.intra4x4_pred_mode[i_left_xy][4];
- h->mb.cache.intra4x4_pred_mode[x264_scan8[2 ] - 1] = h->mb.intra4x4_pred_mode[i_left_xy][5];
- h->mb.cache.intra4x4_pred_mode[x264_scan8[8 ] - 1] = h->mb.intra4x4_pred_mode[i_left_xy][6];
- h->mb.cache.intra4x4_pred_mode[x264_scan8[10] - 1] = h->mb.intra4x4_pred_mode[i_left_xy][3];
+ h->mb.cache.intra4x4_pred_mode[x264_scan8[0 ] - 1] = i4x4[left][4];
+ h->mb.cache.intra4x4_pred_mode[x264_scan8[2 ] - 1] = i4x4[left][5];
+ h->mb.cache.intra4x4_pred_mode[x264_scan8[8 ] - 1] = i4x4[left][6];
+ h->mb.cache.intra4x4_pred_mode[x264_scan8[10] - 1] = i4x4[left][3];
/* load non_zero_count */
- h->mb.cache.non_zero_count[x264_scan8[0 ] - 1] = h->mb.non_zero_count[i_left_xy][3];
- h->mb.cache.non_zero_count[x264_scan8[2 ] - 1] = h->mb.non_zero_count[i_left_xy][7];
- h->mb.cache.non_zero_count[x264_scan8[8 ] - 1] = h->mb.non_zero_count[i_left_xy][11];
- h->mb.cache.non_zero_count[x264_scan8[10] - 1] = h->mb.non_zero_count[i_left_xy][15];
+ h->mb.cache.non_zero_count[x264_scan8[0 ] - 1] = nnz[left][3];
+ h->mb.cache.non_zero_count[x264_scan8[2 ] - 1] = nnz[left][7];
+ h->mb.cache.non_zero_count[x264_scan8[8 ] - 1] = nnz[left][11];
+ h->mb.cache.non_zero_count[x264_scan8[10] - 1] = nnz[left][15];
- h->mb.cache.non_zero_count[x264_scan8[16+0] - 1] = h->mb.non_zero_count[i_left_xy][16+1];
- h->mb.cache.non_zero_count[x264_scan8[16+2] - 1] = h->mb.non_zero_count[i_left_xy][16+3];
+ h->mb.cache.non_zero_count[x264_scan8[16+0] - 1] = nnz[left][16+1];
+ h->mb.cache.non_zero_count[x264_scan8[16+2] - 1] = nnz[left][16+3];
- h->mb.cache.non_zero_count[x264_scan8[16+4+0] - 1] = h->mb.non_zero_count[i_left_xy][16+4+1];
- h->mb.cache.non_zero_count[x264_scan8[16+4+2] - 1] = h->mb.non_zero_count[i_left_xy][16+4+3];
+ h->mb.cache.non_zero_count[x264_scan8[16+4+0] - 1] = nnz[left][16+4+1];
+ h->mb.cache.non_zero_count[x264_scan8[16+4+2] - 1] = nnz[left][16+4+3];
+
+ /* Finish the prefetching */
+ for( int l = 0; l < lists; l++ )
+ {
+ x264_prefetch( &h->mb.mv[l][top_4x4-1] );
+ /* Top right being not in the same cacheline as top left will happen
+ * once every 4 MBs, so one extra prefetch is worthwhile */
+ x264_prefetch( &h->mb.mv[l][top_4x4+4] );
+ x264_prefetch( &h->mb.ref[l][top_8x8-1] );
+ x264_prefetch( &h->mb.mvd[l][top] );
+ }
}
else
{
- h->mb.i_mb_type_left = -1;
h->mb.cache.i_cbp_left = -1;
h->mb.cache.intra4x4_pred_mode[x264_scan8[0 ] - 1] =
h->mb.cache.non_zero_count[x264_scan8[16+4+2] - 1] = 0x80;
}
- if( i_mb_x < h->sps->i_mb_width - 1 && i_top_xy + 1 >= h->sh.i_first_mb )
- {
- h->mb.i_neighbour |= MB_TOPRIGHT;
- h->mb.i_mb_type_topright = h->mb.type[ i_top_xy + 1 ];
- }
- else
- h->mb.i_mb_type_topright = -1;
- if( i_mb_x > 0 && i_top_xy - 1 >= h->sh.i_first_mb )
- {
- h->mb.i_neighbour |= MB_TOPLEFT;
- h->mb.i_mb_type_topleft = h->mb.type[ i_top_xy - 1 ];
- }
- else
- h->mb.i_mb_type_topleft = -1;
-
if( h->pps->b_transform_8x8_mode )
{
h->mb.cache.i_neighbour_transform_size =
- ( i_left_type >= 0 && h->mb.mb_transform_size[i_left_xy] )
- + ( i_top_type >= 0 && h->mb.mb_transform_size[i_top_xy] );
+ ( (h->mb.i_neighbour & MB_LEFT) && h->mb.mb_transform_size[left] )
+ + ( (h->mb.i_neighbour & MB_TOP) && h->mb.mb_transform_size[top] );
}
if( h->sh.b_mbaff )
copy_column8( h->mb.pic.p_fdec[0]-1+12*FDEC_STRIDE, h->mb.pic.p_fdec[0]+15+12*FDEC_STRIDE );
copy_column8( h->mb.pic.p_fdec[1]-1+ 4*FDEC_STRIDE, h->mb.pic.p_fdec[1]+ 7+ 4*FDEC_STRIDE );
copy_column8( h->mb.pic.p_fdec[2]-1+ 4*FDEC_STRIDE, h->mb.pic.p_fdec[2]+ 7+ 4*FDEC_STRIDE );
+ x264_macroblock_load_pic_pointers( h, mb_x, mb_y, 0, 0 );
+ x264_macroblock_load_pic_pointers( h, mb_x, mb_y, 1, 0 );
+ x264_macroblock_load_pic_pointers( h, mb_x, mb_y, 2, 0 );
+ }
+ else
+ {
+ x264_macroblock_load_pic_pointers( h, mb_x, mb_y, 0, 1 );
+ x264_macroblock_load_pic_pointers( h, mb_x, mb_y, 1, 1 );
+ x264_macroblock_load_pic_pointers( h, mb_x, mb_y, 2, 1 );
}
-
- /* load picture pointers */
- x264_macroblock_load_pic_pointers( h, i_mb_x, i_mb_y, 0 );
- x264_macroblock_load_pic_pointers( h, i_mb_x, i_mb_y, 1 );
- x264_macroblock_load_pic_pointers( h, i_mb_x, i_mb_y, 2 );
if( h->fdec->integral )
{
- assert( !h->mb.b_interlaced );
- for( i = 0; i < h->mb.pic.i_fref[0]; i++ )
- h->mb.pic.p_integral[0][i] = &h->fref0[i]->integral[ 16 * ( i_mb_x + i_mb_y * h->fdec->i_stride[0] )];
- for( i = 0; i < h->mb.pic.i_fref[1]; i++ )
- h->mb.pic.p_integral[1][i] = &h->fref1[i]->integral[ 16 * ( i_mb_x + i_mb_y * h->fdec->i_stride[0] )];
+ int offset = 16 * (mb_x + mb_y * h->fdec->i_stride[0]);
+ for( int i = 0; i < h->mb.pic.i_fref[0]; i++ )
+ h->mb.pic.p_integral[0][i] = &h->fref0[i]->integral[offset];
+ for( int i = 0; i < h->mb.pic.i_fref[1]; i++ )
+ h->mb.pic.p_integral[1][i] = &h->fref1[i]->integral[offset];
}
- x264_prefetch_fenc( h, h->fenc, i_mb_x, i_mb_y );
+ x264_prefetch_fenc( h, h->fenc, mb_x, mb_y );
/* load ref/mv/mvd */
- if( h->sh.i_type != SLICE_TYPE_I )
+ for( int l = 0; l < lists; l++ )
{
- const int s8x8 = h->mb.i_b8_stride;
- const int s4x4 = h->mb.i_b4_stride;
+ int16_t (*mv)[2] = h->mb.mv[l];
+ int8_t *ref = h->mb.ref[l];
- int i_list;
+ int i8 = x264_scan8[0] - 1 - 1*8;
+ if( h->mb.i_neighbour & MB_TOPLEFT )
+ {
+ h->mb.cache.ref[l][i8] = ref[top_8x8 - 1];
+ CP32( h->mb.cache.mv[l][i8], mv[top_4x4 - 1] );
+ }
+ else
+ {
+ h->mb.cache.ref[l][i8] = -2;
+ M32( h->mb.cache.mv[l][i8] ) = 0;
+ }
- for( i_list = 0; i_list < (h->sh.i_type == SLICE_TYPE_B ? 2 : 1 ); i_list++ )
+ i8 = x264_scan8[0] - 8;
+ if( h->mb.i_neighbour & MB_TOP )
{
- /*
- h->mb.cache.ref[i_list][x264_scan8[5 ]+1] =
- h->mb.cache.ref[i_list][x264_scan8[7 ]+1] =
- h->mb.cache.ref[i_list][x264_scan8[13]+1] = -2;
- */
+ h->mb.cache.ref[l][i8+0] =
+ h->mb.cache.ref[l][i8+1] = ref[top_8x8 + 0];
+ h->mb.cache.ref[l][i8+2] =
+ h->mb.cache.ref[l][i8+3] = ref[top_8x8 + 1];
+ CP128( h->mb.cache.mv[l][i8], mv[top_4x4] );
+ }
+ else
+ {
+ M128( h->mb.cache.mv[l][i8] ) = M128_ZERO;
+ M32( &h->mb.cache.ref[l][i8] ) = (uint8_t)(-2) * 0x01010101U;
+ }
- if( h->mb.i_neighbour & MB_TOPLEFT )
- {
- const int i8 = x264_scan8[0] - 1 - 1*8;
- const int ir = i_top_8x8 - 1;
- const int iv = i_top_4x4 - 1;
- h->mb.cache.ref[i_list][i8] = h->mb.ref[i_list][ir];
- *(uint32_t*)h->mb.cache.mv[i_list][i8] = *(uint32_t*)h->mb.mv[i_list][iv];
- }
- else
- {
- const int i8 = x264_scan8[0] - 1 - 1*8;
- h->mb.cache.ref[i_list][i8] = -2;
- *(uint32_t*)h->mb.cache.mv[i_list][i8] = 0;
- }
+ i8 = x264_scan8[0] + 4 - 1*8;
+ if( h->mb.i_neighbour & MB_TOPRIGHT )
+ {
+ h->mb.cache.ref[l][i8] = ref[top_8x8 + 2];
+ CP32( h->mb.cache.mv[l][i8], mv[top_4x4 + 4] );
+ }
+ else
+ h->mb.cache.ref[l][i8] = -2;
- if( h->mb.i_neighbour & MB_TOP )
- {
- const int i8 = x264_scan8[0] - 8;
- const int ir = i_top_8x8;
- const int iv = i_top_4x4;
- h->mb.cache.ref[i_list][i8+0] =
- h->mb.cache.ref[i_list][i8+1] = h->mb.ref[i_list][ir + 0];
- h->mb.cache.ref[i_list][i8+2] =
- h->mb.cache.ref[i_list][i8+3] = h->mb.ref[i_list][ir + 1];
- *(uint64_t*)h->mb.cache.mv[i_list][i8+0] = *(uint64_t*)h->mb.mv[i_list][iv+0];
- *(uint64_t*)h->mb.cache.mv[i_list][i8+2] = *(uint64_t*)h->mb.mv[i_list][iv+2];
- }
- else
+ i8 = x264_scan8[0] - 1;
+ if( h->mb.i_neighbour & MB_LEFT )
+ {
+ const int ir = h->mb.i_b8_xy - 1;
+ const int iv = h->mb.i_b4_xy - 1;
+ h->mb.cache.ref[l][i8+0*8] =
+ h->mb.cache.ref[l][i8+1*8] = ref[ir + 0*s8x8];
+ h->mb.cache.ref[l][i8+2*8] =
+ h->mb.cache.ref[l][i8+3*8] = ref[ir + 1*s8x8];
+
+ CP32( h->mb.cache.mv[l][i8+0*8], mv[iv + 0*s4x4] );
+ CP32( h->mb.cache.mv[l][i8+1*8], mv[iv + 1*s4x4] );
+ CP32( h->mb.cache.mv[l][i8+2*8], mv[iv + 2*s4x4] );
+ CP32( h->mb.cache.mv[l][i8+3*8], mv[iv + 3*s4x4] );
+ }
+ else
+ {
+ for( int i = 0; i < 4; i++ )
{
- const int i8 = x264_scan8[0] - 8;
- *(uint64_t*)h->mb.cache.mv[i_list][i8+0] = 0;
- *(uint64_t*)h->mb.cache.mv[i_list][i8+2] = 0;
- *(uint32_t*)&h->mb.cache.ref[i_list][i8] = (uint8_t)(-2) * 0x01010101U;
+ h->mb.cache.ref[l][i8+i*8] = -2;
+ M32( h->mb.cache.mv[l][i8+i*8] ) = 0;
}
+ }
- if( h->mb.i_neighbour & MB_TOPRIGHT )
- {
- const int i8 = x264_scan8[0] + 4 - 1*8;
- const int ir = i_top_8x8 + 2;
- const int iv = i_top_4x4 + 4;
- h->mb.cache.ref[i_list][i8] = h->mb.ref[i_list][ir];
- *(uint32_t*)h->mb.cache.mv[i_list][i8] = *(uint32_t*)h->mb.mv[i_list][iv];
- }
+ if( h->param.b_cabac )
+ {
+ uint8_t (*mvd)[8][2] = h->mb.mvd[l];
+ if( h->mb.i_neighbour & MB_TOP )
+ CP64( h->mb.cache.mvd[l][x264_scan8[0] - 8], mvd[top][0] );
else
- {
- const int i8 = x264_scan8[0] + 4 - 1*8;
- h->mb.cache.ref[i_list][i8] = -2;
- *(uint32_t*)h->mb.cache.mv[i_list][i8] = 0;
- }
+ M64( h->mb.cache.mvd[l][x264_scan8[0] - 8] ) = 0;
if( h->mb.i_neighbour & MB_LEFT )
{
- const int i8 = x264_scan8[0] - 1;
- const int ir = i_mb_8x8 - 1;
- const int iv = i_mb_4x4 - 1;
- h->mb.cache.ref[i_list][i8+0*8] =
- h->mb.cache.ref[i_list][i8+1*8] = h->mb.ref[i_list][ir + 0*s8x8];
- h->mb.cache.ref[i_list][i8+2*8] =
- h->mb.cache.ref[i_list][i8+3*8] = h->mb.ref[i_list][ir + 1*s8x8];
-
- *(uint32_t*)h->mb.cache.mv[i_list][i8+0*8] = *(uint32_t*)h->mb.mv[i_list][iv + 0*s4x4];
- *(uint32_t*)h->mb.cache.mv[i_list][i8+1*8] = *(uint32_t*)h->mb.mv[i_list][iv + 1*s4x4];
- *(uint32_t*)h->mb.cache.mv[i_list][i8+2*8] = *(uint32_t*)h->mb.mv[i_list][iv + 2*s4x4];
- *(uint32_t*)h->mb.cache.mv[i_list][i8+3*8] = *(uint32_t*)h->mb.mv[i_list][iv + 3*s4x4];
+ CP16( h->mb.cache.mvd[l][x264_scan8[0 ] - 1], mvd[left][4] );
+ CP16( h->mb.cache.mvd[l][x264_scan8[2 ] - 1], mvd[left][5] );
+ CP16( h->mb.cache.mvd[l][x264_scan8[8 ] - 1], mvd[left][6] );
+ CP16( h->mb.cache.mvd[l][x264_scan8[10] - 1], mvd[left][3] );
}
else
- {
- const int i8 = x264_scan8[0] - 1;
- for( i = 0; i < 4; i++ )
- {
- h->mb.cache.ref[i_list][i8+i*8] = -2;
- *(uint32_t*)h->mb.cache.mv[i_list][i8+i*8] = 0;
- }
- }
-
- if( h->param.b_cabac )
- {
- if( i_top_type >= 0 )
- {
- const int i8 = x264_scan8[0] - 8;
- const int iv = i_top_4x4;
- *(uint64_t*)h->mb.cache.mvd[i_list][i8+0] = *(uint64_t*)h->mb.mvd[i_list][iv+0];
- *(uint64_t*)h->mb.cache.mvd[i_list][i8+2] = *(uint64_t*)h->mb.mvd[i_list][iv+2];
- }
- else
- {
- const int i8 = x264_scan8[0] - 8;
- *(uint64_t*)h->mb.cache.mvd[i_list][i8+0] =
- *(uint64_t*)h->mb.cache.mvd[i_list][i8+2] = 0;
- }
-
- if( i_left_type >= 0 )
- {
- const int i8 = x264_scan8[0] - 1;
- const int iv = i_mb_4x4 - 1;
- *(uint32_t*)h->mb.cache.mvd[i_list][i8+0*8] = *(uint32_t*)h->mb.mvd[i_list][iv + 0*s4x4];
- *(uint32_t*)h->mb.cache.mvd[i_list][i8+1*8] = *(uint32_t*)h->mb.mvd[i_list][iv + 1*s4x4];
- *(uint32_t*)h->mb.cache.mvd[i_list][i8+2*8] = *(uint32_t*)h->mb.mvd[i_list][iv + 2*s4x4];
- *(uint32_t*)h->mb.cache.mvd[i_list][i8+3*8] = *(uint32_t*)h->mb.mvd[i_list][iv + 3*s4x4];
- }
- else
- {
- const int i8 = x264_scan8[0] - 1;
- for( i = 0; i < 4; i++ )
- *(uint32_t*)h->mb.cache.mvd[i_list][i8+i*8] = 0;
- }
- }
+ for( int i = 0; i < 4; i++ )
+ M16( h->mb.cache.mvd[l][x264_scan8[0]-1+i*8] ) = 0;
}
+ }
- /* load skip */
- if( h->sh.i_type == SLICE_TYPE_B && h->param.b_cabac )
+ /* load skip */
+ if( h->sh.i_type == SLICE_TYPE_B )
+ {
+ h->mb.bipred_weight = h->mb.bipred_weight_buf[h->mb.b_interlaced&(mb_y&1)];
+ h->mb.dist_scale_factor = h->mb.dist_scale_factor_buf[h->mb.b_interlaced&(mb_y&1)];
+ if( h->param.b_cabac )
{
uint8_t skipbp;
x264_macroblock_cache_skip( h, 0, 0, 4, 4, 0 );
- skipbp = i_left_type >= 0 ? h->mb.skipbp[i_left_xy] : 0;
+ skipbp = (h->mb.i_neighbour & MB_LEFT) ? h->mb.skipbp[left] : 0;
h->mb.cache.skip[x264_scan8[0] - 1] = skipbp & 0x2;
h->mb.cache.skip[x264_scan8[8] - 1] = skipbp & 0x8;
- skipbp = i_top_type >= 0 ? h->mb.skipbp[i_top_xy] : 0;
+ skipbp = (h->mb.i_neighbour & MB_TOP) ? h->mb.skipbp[top] : 0;
h->mb.cache.skip[x264_scan8[0] - 8] = skipbp & 0x4;
h->mb.cache.skip[x264_scan8[4] - 8] = skipbp & 0x8;
}
-
- if( h->sh.i_type == SLICE_TYPE_P )
- x264_mb_predict_mv_pskip( h, h->mb.cache.pskip_mv );
}
+ if( h->sh.i_type == SLICE_TYPE_P )
+ x264_mb_predict_mv_pskip( h, h->mb.cache.pskip_mv );
+
h->mb.i_neighbour4[0] =
- h->mb.i_neighbour8[0] = (h->mb.i_neighbour & (MB_TOP|MB_LEFT|MB_TOPLEFT))
- | ((h->mb.i_neighbour & MB_TOP) ? MB_TOPRIGHT : 0);
+ h->mb.i_neighbour8[0] = (h->mb.i_neighbour_intra & (MB_TOP|MB_LEFT|MB_TOPLEFT))
+ | ((h->mb.i_neighbour_intra & MB_TOP) ? MB_TOPRIGHT : 0);
h->mb.i_neighbour4[4] =
- h->mb.i_neighbour4[1] = MB_LEFT | ((h->mb.i_neighbour & MB_TOP) ? (MB_TOP|MB_TOPLEFT|MB_TOPRIGHT) : 0);
+ h->mb.i_neighbour4[1] = MB_LEFT | ((h->mb.i_neighbour_intra & MB_TOP) ? (MB_TOP|MB_TOPLEFT|MB_TOPRIGHT) : 0);
h->mb.i_neighbour4[2] =
h->mb.i_neighbour4[8] =
h->mb.i_neighbour4[10] =
- h->mb.i_neighbour8[2] = MB_TOP|MB_TOPRIGHT | ((h->mb.i_neighbour & MB_LEFT) ? (MB_LEFT|MB_TOPLEFT) : 0);
+ h->mb.i_neighbour8[2] = MB_TOP|MB_TOPRIGHT | ((h->mb.i_neighbour_intra & MB_LEFT) ? (MB_LEFT|MB_TOPLEFT) : 0);
h->mb.i_neighbour4[5] =
- h->mb.i_neighbour8[1] = MB_LEFT | (h->mb.i_neighbour & MB_TOPRIGHT)
- | ((h->mb.i_neighbour & MB_TOP) ? MB_TOP|MB_TOPLEFT : 0);
+ h->mb.i_neighbour8[1] = MB_LEFT | (h->mb.i_neighbour_intra & MB_TOPRIGHT)
+ | ((h->mb.i_neighbour_intra & MB_TOP) ? MB_TOP|MB_TOPLEFT : 0);
+}
+
+void x264_macroblock_cache_load_neighbours_deblock( x264_t *h, int mb_x, int mb_y )
+{
+ int deblock_on_slice_edges = h->sh.i_disable_deblocking_filter_idc != 2;
+
+ h->mb.i_neighbour = 0;
+ h->mb.i_mb_xy = mb_y * h->mb.i_mb_stride + mb_x;
+
+ if( mb_x > 0 )
+ {
+ h->mb.i_mb_left_xy = h->mb.i_mb_xy - 1;
+ if( deblock_on_slice_edges || h->mb.slice_table[h->mb.i_mb_left_xy] == h->mb.slice_table[h->mb.i_mb_xy] )
+ h->mb.i_neighbour |= MB_LEFT;
+ }
+
+ if( mb_y > h->mb.b_interlaced )
+ {
+ h->mb.i_mb_top_xy = h->mb.i_mb_xy - (h->mb.i_mb_stride << h->mb.b_interlaced);
+ if( deblock_on_slice_edges || h->mb.slice_table[h->mb.i_mb_top_xy] == h->mb.slice_table[h->mb.i_mb_xy] )
+ h->mb.i_neighbour |= MB_TOP;
+ }
}
-static void ALWAYS_INLINE x264_macroblock_store_pic( x264_t *h, int i)
+void x264_macroblock_cache_load_deblock( x264_t *h )
+{
+ if( IS_INTRA( h->mb.type[h->mb.i_mb_xy] ) )
+ return;
+
+ /* If we have multiple slices and we're deblocking on slice edges, we
+ * have to reload neighbour data. */
+ if( h->sh.i_first_mb && h->sh.i_disable_deblocking_filter_idc != 2 )
+ {
+ int old_neighbour = h->mb.i_neighbour;
+ int mb_x = h->mb.i_mb_x;
+ int mb_y = h->mb.i_mb_y;
+ x264_macroblock_cache_load_neighbours_deblock( h, mb_x, mb_y );
+ int new_neighbour = h->mb.i_neighbour;
+ h->mb.i_neighbour &= ~old_neighbour;
+ if( h->mb.i_neighbour )
+ {
+ int top_y = mb_y - (1 << h->mb.b_interlaced);
+ int top_8x8 = (2*top_y+1) * h->mb.i_b8_stride + 2*mb_x;
+ int top_4x4 = (4*top_y+3) * h->mb.i_b4_stride + 4*mb_x;
+ int s8x8 = h->mb.i_b8_stride;
+ int s4x4 = h->mb.i_b4_stride;
+
+ uint8_t (*nnz)[24] = h->mb.non_zero_count;
+
+ if( h->mb.i_neighbour & MB_TOP )
+ CP32( &h->mb.cache.non_zero_count[x264_scan8[0] - 8], &nnz[h->mb.i_mb_top_xy][12] );
+
+ if( h->mb.i_neighbour & MB_LEFT )
+ {
+ int left = h->mb.i_mb_left_xy;
+ h->mb.cache.non_zero_count[x264_scan8[0 ] - 1] = nnz[left][3];
+ h->mb.cache.non_zero_count[x264_scan8[2 ] - 1] = nnz[left][7];
+ h->mb.cache.non_zero_count[x264_scan8[8 ] - 1] = nnz[left][11];
+ h->mb.cache.non_zero_count[x264_scan8[10] - 1] = nnz[left][15];
+ }
+
+ for( int l = 0; l <= (h->sh.i_type == SLICE_TYPE_B); l++ )
+ {
+ int16_t (*mv)[2] = h->mb.mv[l];
+ int8_t *ref = h->mb.ref[l];
+
+ int i8 = x264_scan8[0] - 8;
+ if( h->mb.i_neighbour & MB_TOP )
+ {
+ h->mb.cache.ref[l][i8+0] =
+ h->mb.cache.ref[l][i8+1] = ref[top_8x8 + 0];
+ h->mb.cache.ref[l][i8+2] =
+ h->mb.cache.ref[l][i8+3] = ref[top_8x8 + 1];
+ CP128( h->mb.cache.mv[l][i8], mv[top_4x4] );
+ }
+
+ i8 = x264_scan8[0] - 1;
+ if( h->mb.i_neighbour & MB_LEFT )
+ {
+ int ir = h->mb.i_b8_xy - 1;
+ int iv = h->mb.i_b4_xy - 1;
+ h->mb.cache.ref[l][i8+0*8] =
+ h->mb.cache.ref[l][i8+1*8] = ref[ir + 0*s8x8];
+ h->mb.cache.ref[l][i8+2*8] =
+ h->mb.cache.ref[l][i8+3*8] = ref[ir + 1*s8x8];
+
+ CP32( h->mb.cache.mv[l][i8+0*8], mv[iv + 0*s4x4] );
+ CP32( h->mb.cache.mv[l][i8+1*8], mv[iv + 1*s4x4] );
+ CP32( h->mb.cache.mv[l][i8+2*8], mv[iv + 2*s4x4] );
+ CP32( h->mb.cache.mv[l][i8+3*8], mv[iv + 3*s4x4] );
+ }
+ }
+ }
+ h->mb.i_neighbour = new_neighbour;
+ }
+
+ if( h->param.analyse.i_weighted_pred && h->sh.i_type == SLICE_TYPE_P )
+ {
+ /* Handle reference frame duplicates */
+ int i8 = x264_scan8[0] - 8;
+ h->mb.cache.ref[0][i8+0] =
+ h->mb.cache.ref[0][i8+1] = deblock_ref_table(h->mb.cache.ref[0][i8+0]);
+ h->mb.cache.ref[0][i8+2] =
+ h->mb.cache.ref[0][i8+3] = deblock_ref_table(h->mb.cache.ref[0][i8+2]);
+
+ i8 = x264_scan8[0] - 1;
+ h->mb.cache.ref[0][i8+0*8] =
+ h->mb.cache.ref[0][i8+1*8] = deblock_ref_table(h->mb.cache.ref[0][i8+0*8]);
+ h->mb.cache.ref[0][i8+2*8] =
+ h->mb.cache.ref[0][i8+3*8] = deblock_ref_table(h->mb.cache.ref[0][i8+2*8]);
+
+ int ref0 = deblock_ref_table(h->mb.cache.ref[0][x264_scan8[ 0]]);
+ int ref1 = deblock_ref_table(h->mb.cache.ref[0][x264_scan8[ 4]]);
+ int ref2 = deblock_ref_table(h->mb.cache.ref[0][x264_scan8[ 8]]);
+ int ref3 = deblock_ref_table(h->mb.cache.ref[0][x264_scan8[12]]);
+ uint32_t reftop = pack16to32( (uint8_t)ref0, (uint8_t)ref1 ) * 0x0101;
+ uint32_t refbot = pack16to32( (uint8_t)ref2, (uint8_t)ref3 ) * 0x0101;
+
+ M32( &h->mb.cache.ref[0][x264_scan8[0]+8*0] ) = reftop;
+ M32( &h->mb.cache.ref[0][x264_scan8[0]+8*1] ) = reftop;
+ M32( &h->mb.cache.ref[0][x264_scan8[0]+8*2] ) = refbot;
+ M32( &h->mb.cache.ref[0][x264_scan8[0]+8*3] ) = refbot;
+ }
+
+ /* Munge NNZ for cavlc + 8x8dct */
+ if( !h->param.b_cabac && h->pps->b_transform_8x8_mode )
+ {
+ uint8_t (*nnz)[24] = h->mb.non_zero_count;
+ int top = h->mb.i_mb_top_xy;
+ int left = h->mb.i_mb_left_xy;
+
+ if( (h->mb.i_neighbour & MB_TOP) && h->mb.mb_transform_size[top] )
+ {
+ int i8 = x264_scan8[0] - 8;
+ int nnz_top0 = M16( &nnz[top][8] ) | M16( &nnz[top][12] );
+ int nnz_top1 = M16( &nnz[top][10] ) | M16( &nnz[top][14] );
+ M16( &h->mb.cache.non_zero_count[i8+0] ) = nnz_top0 ? 0x0101 : 0;
+ M16( &h->mb.cache.non_zero_count[i8+2] ) = nnz_top1 ? 0x0101 : 0;
+ }
+
+ if( (h->mb.i_neighbour & MB_LEFT) && h->mb.mb_transform_size[left] )
+ {
+ int i8 = x264_scan8[0] - 1;
+ int nnz_left0 = M16( &nnz[left][2] ) | M16( &nnz[left][6] );
+ int nnz_left1 = M16( &nnz[left][10] ) | M16( &nnz[left][14] );
+ h->mb.cache.non_zero_count[i8+8*0] = !!nnz_left0;
+ h->mb.cache.non_zero_count[i8+8*1] = !!nnz_left0;
+ h->mb.cache.non_zero_count[i8+8*2] = !!nnz_left1;
+ h->mb.cache.non_zero_count[i8+8*3] = !!nnz_left1;
+ }
+
+ if( h->mb.mb_transform_size[h->mb.i_mb_xy] )
+ {
+ int nnz0 = M16( &h->mb.cache.non_zero_count[x264_scan8[ 0]] ) | M16( &h->mb.cache.non_zero_count[x264_scan8[ 2]] );
+ int nnz1 = M16( &h->mb.cache.non_zero_count[x264_scan8[ 4]] ) | M16( &h->mb.cache.non_zero_count[x264_scan8[ 6]] );
+ int nnz2 = M16( &h->mb.cache.non_zero_count[x264_scan8[ 8]] ) | M16( &h->mb.cache.non_zero_count[x264_scan8[10]] );
+ int nnz3 = M16( &h->mb.cache.non_zero_count[x264_scan8[12]] ) | M16( &h->mb.cache.non_zero_count[x264_scan8[14]] );
+ uint32_t nnztop = pack16to32( !!nnz0, !!nnz1 ) * 0x0101;
+ uint32_t nnzbot = pack16to32( !!nnz2, !!nnz3 ) * 0x0101;
+
+ M32( &h->mb.cache.non_zero_count[x264_scan8[0]+8*0] ) = nnztop;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[0]+8*1] ) = nnztop;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[0]+8*2] ) = nnzbot;
+ M32( &h->mb.cache.non_zero_count[x264_scan8[0]+8*3] ) = nnzbot;
+ }
+ }
+}
+
+static void ALWAYS_INLINE x264_macroblock_store_pic( x264_t *h, int i )
{
int w = i ? 8 : 16;
int i_stride = h->fdec->i_stride[!!i];
int i_pix_offset = h->mb.b_interlaced
? w * (h->mb.i_mb_x + (h->mb.i_mb_y&~1) * i_stride) + (h->mb.i_mb_y&1) * i_stride
: w * (h->mb.i_mb_x + h->mb.i_mb_y * i_stride);
- h->mc.copy[i?PIXEL_8x8:PIXEL_16x16](
- &h->fdec->plane[i][i_pix_offset], i_stride2,
- h->mb.pic.p_fdec[i], FDEC_STRIDE, w );
+ h->mc.copy[i?PIXEL_8x8:PIXEL_16x16]( &h->fdec->plane[i][i_pix_offset], i_stride2,
+ h->mb.pic.p_fdec[i], FDEC_STRIDE, w );
}
void x264_macroblock_cache_save( x264_t *h )
const int i_mb_4x4 = h->mb.i_b4_xy;
const int i_mb_8x8 = h->mb.i_b8_xy;
- /* GCC pessimizes direct stores to heap-allocated 8-bit arrays due to aliasing.*/
+ /* GCC pessimizes direct stores to heap-allocated arrays due to aliasing. */
/* By only dereferencing them once, we avoid this issue. */
- int8_t *intra4x4_pred_mode = h->mb.intra4x4_pred_mode[i_mb_xy];
- uint8_t *non_zero_count = h->mb.non_zero_count[i_mb_xy];
-
- int i, y;
+ int8_t *i4x4 = h->mb.intra4x4_pred_mode[i_mb_xy];
+ uint8_t *nnz = h->mb.non_zero_count[i_mb_xy];
x264_macroblock_store_pic( h, 0 );
x264_macroblock_store_pic( h, 1 );
x264_prefetch_fenc( h, h->fdec, h->mb.i_mb_x, h->mb.i_mb_y );
h->mb.type[i_mb_xy] = i_mb_type;
+ h->mb.slice_table[i_mb_xy] = h->sh.i_first_mb;
+ h->mb.partition[i_mb_xy] = IS_INTRA( i_mb_type ) ? D_16x16 : h->mb.i_partition;
h->mb.i_mb_prev_xy = i_mb_xy;
/* save intra4x4 */
if( i_mb_type == I_4x4 )
{
- *(uint32_t*)&intra4x4_pred_mode[0] = *(uint32_t*)&h->mb.cache.intra4x4_pred_mode[x264_scan8[10] ];
- *(uint32_t*)&intra4x4_pred_mode[4] = pack8to32(h->mb.cache.intra4x4_pred_mode[x264_scan8[5] ],
- h->mb.cache.intra4x4_pred_mode[x264_scan8[7] ],
- h->mb.cache.intra4x4_pred_mode[x264_scan8[13] ], 0);
+ CP32( &i4x4[0], &h->mb.cache.intra4x4_pred_mode[x264_scan8[10]] );
+ M32( &i4x4[4] ) = pack8to32( h->mb.cache.intra4x4_pred_mode[x264_scan8[5] ],
+ h->mb.cache.intra4x4_pred_mode[x264_scan8[7] ],
+ h->mb.cache.intra4x4_pred_mode[x264_scan8[13] ], 0);
}
+ else if( !h->param.b_constrained_intra || IS_INTRA(i_mb_type) )
+ M64( i4x4 ) = I_PRED_4x4_DC * 0x0101010101010101ULL;
else
- *(uint64_t*)intra4x4_pred_mode = I_PRED_4x4_DC * 0x0101010101010101ULL;
+ M64( i4x4 ) = (uint8_t)(-1) * 0x0101010101010101ULL;
+
if( i_mb_type == I_PCM )
{
h->mb.i_cbp_luma = 0xf;
h->mb.cbp[i_mb_xy] = 0x72f; /* all set */
h->mb.b_transform_8x8 = 0;
- for( i = 0; i < 16 + 2*4; i++ )
- non_zero_count[i] = 16;
+ memset( nnz, 16, sizeof( *h->mb.non_zero_count ) );
+ for( int i = 0; i < 24; i++ )
+ h->mb.cache.non_zero_count[x264_scan8[i]] = 16;
}
else
{
/* save non zero count */
- *(uint32_t*)&non_zero_count[0*4] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[0]+0*8];
- *(uint32_t*)&non_zero_count[1*4] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[0]+1*8];
- *(uint32_t*)&non_zero_count[2*4] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[0]+2*8];
- *(uint32_t*)&non_zero_count[3*4] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[0]+3*8];
- *(uint16_t*)&non_zero_count[16+0*2] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[16+0*2]-1] >> 8;
- *(uint16_t*)&non_zero_count[16+1*2] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[16+1*2]-1] >> 8;
- *(uint16_t*)&non_zero_count[16+2*2] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[16+2*2]-1] >> 8;
- *(uint16_t*)&non_zero_count[16+3*2] = *(uint32_t*)&h->mb.cache.non_zero_count[x264_scan8[16+3*2]-1] >> 8;
+ CP32( &nnz[0*4], &h->mb.cache.non_zero_count[x264_scan8[0]+0*8] );
+ CP32( &nnz[1*4], &h->mb.cache.non_zero_count[x264_scan8[0]+1*8] );
+ CP32( &nnz[2*4], &h->mb.cache.non_zero_count[x264_scan8[0]+2*8] );
+ CP32( &nnz[3*4], &h->mb.cache.non_zero_count[x264_scan8[0]+3*8] );
+ M16( &nnz[16+0*2] ) = M32( &h->mb.cache.non_zero_count[x264_scan8[16+0*2]-1] ) >> 8;
+ M16( &nnz[16+1*2] ) = M32( &h->mb.cache.non_zero_count[x264_scan8[16+1*2]-1] ) >> 8;
+ M16( &nnz[16+2*2] ) = M32( &h->mb.cache.non_zero_count[x264_scan8[16+2*2]-1] ) >> 8;
+ M16( &nnz[16+3*2] ) = M32( &h->mb.cache.non_zero_count[x264_scan8[16+3*2]-1] ) >> 8;
if( h->mb.i_type != I_16x16 && h->mb.i_cbp_luma == 0 && h->mb.i_cbp_chroma == 0 )
h->mb.i_qp = h->mb.i_last_qp;
if( h->sh.i_type != SLICE_TYPE_I )
{
+ int16_t (*mv0)[2] = &h->mb.mv[0][i_mb_4x4];
+ int16_t (*mv1)[2] = &h->mb.mv[1][i_mb_4x4];
+ int8_t *ref0 = &h->mb.ref[0][i_mb_8x8];
+ int8_t *ref1 = &h->mb.ref[1][i_mb_8x8];
if( !IS_INTRA( i_mb_type ) )
{
- h->mb.ref[0][i_mb_8x8+0+0*s8x8] = h->mb.cache.ref[0][x264_scan8[0]];
- h->mb.ref[0][i_mb_8x8+1+0*s8x8] = h->mb.cache.ref[0][x264_scan8[4]];
- h->mb.ref[0][i_mb_8x8+0+1*s8x8] = h->mb.cache.ref[0][x264_scan8[8]];
- h->mb.ref[0][i_mb_8x8+1+1*s8x8] = h->mb.cache.ref[0][x264_scan8[12]];
- for( y = 0; y < 4; y++ )
- {
- *(uint64_t*)h->mb.mv[0][i_mb_4x4+y*s4x4+0] = *(uint64_t*)h->mb.cache.mv[0][x264_scan8[0]+8*y+0];
- *(uint64_t*)h->mb.mv[0][i_mb_4x4+y*s4x4+2] = *(uint64_t*)h->mb.cache.mv[0][x264_scan8[0]+8*y+2];
- }
+ ref0[0+0*s8x8] = h->mb.cache.ref[0][x264_scan8[0]];
+ ref0[1+0*s8x8] = h->mb.cache.ref[0][x264_scan8[4]];
+ ref0[0+1*s8x8] = h->mb.cache.ref[0][x264_scan8[8]];
+ ref0[1+1*s8x8] = h->mb.cache.ref[0][x264_scan8[12]];
+ CP128( &mv0[0*s4x4], h->mb.cache.mv[0][x264_scan8[0]+8*0] );
+ CP128( &mv0[1*s4x4], h->mb.cache.mv[0][x264_scan8[0]+8*1] );
+ CP128( &mv0[2*s4x4], h->mb.cache.mv[0][x264_scan8[0]+8*2] );
+ CP128( &mv0[3*s4x4], h->mb.cache.mv[0][x264_scan8[0]+8*3] );
if( h->sh.i_type == SLICE_TYPE_B )
{
- h->mb.ref[1][i_mb_8x8+0+0*s8x8] = h->mb.cache.ref[1][x264_scan8[0]];
- h->mb.ref[1][i_mb_8x8+1+0*s8x8] = h->mb.cache.ref[1][x264_scan8[4]];
- h->mb.ref[1][i_mb_8x8+0+1*s8x8] = h->mb.cache.ref[1][x264_scan8[8]];
- h->mb.ref[1][i_mb_8x8+1+1*s8x8] = h->mb.cache.ref[1][x264_scan8[12]];
- for( y = 0; y < 4; y++ )
- {
- *(uint64_t*)h->mb.mv[1][i_mb_4x4+y*s4x4+0] = *(uint64_t*)h->mb.cache.mv[1][x264_scan8[0]+8*y+0];
- *(uint64_t*)h->mb.mv[1][i_mb_4x4+y*s4x4+2] = *(uint64_t*)h->mb.cache.mv[1][x264_scan8[0]+8*y+2];
- }
+ ref1[0+0*s8x8] = h->mb.cache.ref[1][x264_scan8[0]];
+ ref1[1+0*s8x8] = h->mb.cache.ref[1][x264_scan8[4]];
+ ref1[0+1*s8x8] = h->mb.cache.ref[1][x264_scan8[8]];
+ ref1[1+1*s8x8] = h->mb.cache.ref[1][x264_scan8[12]];
+ CP128( &mv1[0*s4x4], h->mb.cache.mv[1][x264_scan8[0]+8*0] );
+ CP128( &mv1[1*s4x4], h->mb.cache.mv[1][x264_scan8[0]+8*1] );
+ CP128( &mv1[2*s4x4], h->mb.cache.mv[1][x264_scan8[0]+8*2] );
+ CP128( &mv1[3*s4x4], h->mb.cache.mv[1][x264_scan8[0]+8*3] );
}
}
else
{
- int i_list;
- for( i_list = 0; i_list < (h->sh.i_type == SLICE_TYPE_B ? 2 : 1 ); i_list++ )
+ M16( &ref0[0*s8x8] ) = (uint8_t)(-1) * 0x0101;
+ M16( &ref0[1*s8x8] ) = (uint8_t)(-1) * 0x0101;
+ M128( &mv0[0*s4x4] ) = M128_ZERO;
+ M128( &mv0[1*s4x4] ) = M128_ZERO;
+ M128( &mv0[2*s4x4] ) = M128_ZERO;
+ M128( &mv0[3*s4x4] ) = M128_ZERO;
+ if( h->sh.i_type == SLICE_TYPE_B )
{
- *(uint16_t*)&h->mb.ref[i_list][i_mb_8x8+0*s8x8] = (uint8_t)(-1) * 0x0101;
- *(uint16_t*)&h->mb.ref[i_list][i_mb_8x8+1*s8x8] = (uint8_t)(-1) * 0x0101;
- for( y = 0; y < 4; y++ )
- {
- *(uint64_t*)h->mb.mv[i_list][i_mb_4x4+y*s4x4+0] = 0;
- *(uint64_t*)h->mb.mv[i_list][i_mb_4x4+y*s4x4+2] = 0;
- }
+ M16( &ref1[0*s8x8] ) = (uint8_t)(-1) * 0x0101;
+ M16( &ref1[1*s8x8] ) = (uint8_t)(-1) * 0x0101;
+ M128( &mv1[0*s4x4] ) = M128_ZERO;
+ M128( &mv1[1*s4x4] ) = M128_ZERO;
+ M128( &mv1[2*s4x4] ) = M128_ZERO;
+ M128( &mv1[3*s4x4] ) = M128_ZERO;
}
}
}
if( h->param.b_cabac )
{
+ uint8_t (*mvd0)[2] = h->mb.mvd[0][i_mb_xy];
+ uint8_t (*mvd1)[2] = h->mb.mvd[1][i_mb_xy];
if( IS_INTRA(i_mb_type) && i_mb_type != I_PCM )
h->mb.chroma_pred_mode[i_mb_xy] = x264_mb_pred_mode8x8c_fix[ h->mb.i_chroma_pred_mode ];
else
h->mb.chroma_pred_mode[i_mb_xy] = I_PRED_CHROMA_DC;
- if( !IS_INTRA( i_mb_type ) && !IS_SKIP( i_mb_type ) && !IS_DIRECT( i_mb_type ) )
+ if( (0x3FF30 >> i_mb_type) & 1 ) /* !INTRA && !SKIP && !DIRECT */
{
- for( y = 0; y < 4; y++ )
+ CP64( mvd0[0], h->mb.cache.mvd[0][x264_scan8[10]] );
+ CP16( mvd0[4], h->mb.cache.mvd[0][x264_scan8[5 ]] );
+ CP16( mvd0[5], h->mb.cache.mvd[0][x264_scan8[7 ]] );
+ CP16( mvd0[6], h->mb.cache.mvd[0][x264_scan8[13]] );
+ if( h->sh.i_type == SLICE_TYPE_B )
{
- *(uint64_t*)h->mb.mvd[0][i_mb_4x4+y*s4x4+0] = *(uint64_t*)h->mb.cache.mvd[0][x264_scan8[0]+8*y+0];
- *(uint64_t*)h->mb.mvd[0][i_mb_4x4+y*s4x4+2] = *(uint64_t*)h->mb.cache.mvd[0][x264_scan8[0]+8*y+2];
+ CP64( mvd1[0], h->mb.cache.mvd[1][x264_scan8[10]] );
+ CP16( mvd1[4], h->mb.cache.mvd[1][x264_scan8[5 ]] );
+ CP16( mvd1[5], h->mb.cache.mvd[1][x264_scan8[7 ]] );
+ CP16( mvd1[6], h->mb.cache.mvd[1][x264_scan8[13]] );
}
- if( h->sh.i_type == SLICE_TYPE_B )
- for( y = 0; y < 4; y++ )
- {
- *(uint64_t*)h->mb.mvd[1][i_mb_4x4+y*s4x4+0] = *(uint64_t*)h->mb.cache.mvd[1][x264_scan8[0]+8*y+0];
- *(uint64_t*)h->mb.mvd[1][i_mb_4x4+y*s4x4+2] = *(uint64_t*)h->mb.cache.mvd[1][x264_scan8[0]+8*y+2];
- }
}
else
{
- for( y = 0; y < 4; y++ )
- {
- *(uint64_t*)h->mb.mvd[0][i_mb_4x4+y*s4x4+0] = 0;
- *(uint64_t*)h->mb.mvd[0][i_mb_4x4+y*s4x4+2] = 0;
- }
+ M128( mvd0[0] ) = M128_ZERO;
if( h->sh.i_type == SLICE_TYPE_B )
- for( y = 0; y < 4; y++ )
- {
- *(uint64_t*)h->mb.mvd[1][i_mb_4x4+y*s4x4+0] = 0;
- *(uint64_t*)h->mb.mvd[1][i_mb_4x4+y*s4x4+2] = 0;
- }
+ M128( mvd1[0] ) = M128_ZERO;
}
if( h->sh.i_type == SLICE_TYPE_B )
}
}
+
void x264_macroblock_bipred_init( x264_t *h )
{
- int i_ref0, i_ref1;
- for( i_ref0 = 0; i_ref0 < h->i_ref0; i_ref0++ )
- {
- int poc0 = h->fref0[i_ref0]->i_poc;
- for( i_ref1 = 0; i_ref1 < h->i_ref1; i_ref1++ )
+ for( int field = 0; field <= h->sh.b_mbaff; field++ )
+ for( int i_ref0 = 0; i_ref0 < (h->i_ref0<<h->sh.b_mbaff); i_ref0++ )
{
- int dist_scale_factor;
- int poc1 = h->fref1[i_ref1]->i_poc;
- int td = x264_clip3( poc1 - poc0, -128, 127 );
- if( td == 0 /* || pic0 is a long-term ref */ )
- dist_scale_factor = 256;
- else
+ int poc0 = h->fref0[i_ref0>>h->sh.b_mbaff]->i_poc;
+ if( h->sh.b_mbaff && field^(i_ref0&1) )
+ poc0 += h->sh.i_delta_poc_bottom;
+ for( int i_ref1 = 0; i_ref1 < (h->i_ref1<<h->sh.b_mbaff); i_ref1++ )
{
- int tb = x264_clip3( h->fdec->i_poc - poc0, -128, 127 );
- int tx = (16384 + (abs(td) >> 1)) / td;
- dist_scale_factor = x264_clip3( (tb * tx + 32) >> 6, -1024, 1023 );
- }
- h->mb.dist_scale_factor[i_ref0][i_ref1] = dist_scale_factor;
+ int dist_scale_factor;
+ int poc1 = h->fref1[i_ref1>>h->sh.b_mbaff]->i_poc;
+ if( h->sh.b_mbaff && field^(i_ref1&1) )
+ poc1 += h->sh.i_delta_poc_bottom;
+ int cur_poc = h->fdec->i_poc + field*h->sh.i_delta_poc_bottom;
+ int td = x264_clip3( poc1 - poc0, -128, 127 );
+ if( td == 0 /* || pic0 is a long-term ref */ )
+ dist_scale_factor = 256;
+ else
+ {
+ int tb = x264_clip3( cur_poc - poc0, -128, 127 );
+ int tx = (16384 + (abs(td) >> 1)) / td;
+ dist_scale_factor = x264_clip3( (tb * tx + 32) >> 6, -1024, 1023 );
+ }
- dist_scale_factor >>= 2;
- if( h->param.analyse.b_weighted_bipred
- && dist_scale_factor >= -64
- && dist_scale_factor <= 128 )
- {
- h->mb.bipred_weight[i_ref0][i_ref1] = 64 - dist_scale_factor;
- // ssse3 implementation of biweight doesn't support the extrema.
- // if we ever generate them, we'll have to drop that optimization.
- assert( dist_scale_factor >= -63 && dist_scale_factor <= 127 );
+ h->mb.dist_scale_factor_buf[field][i_ref0][i_ref1] = dist_scale_factor;
+
+ dist_scale_factor >>= 2;
+ if( h->param.analyse.b_weighted_bipred
+ && dist_scale_factor >= -64
+ && dist_scale_factor <= 128 )
+ {
+ h->mb.bipred_weight_buf[field][i_ref0][i_ref1] = 64 - dist_scale_factor;
+ // ssse3 implementation of biweight doesn't support the extrema.
+ // if we ever generate them, we'll have to drop that optimization.
+ assert( dist_scale_factor >= -63 && dist_scale_factor <= 127 );
+ }
+ else
+ h->mb.bipred_weight_buf[field][i_ref0][i_ref1] = 32;
}
- else
- h->mb.bipred_weight[i_ref0][i_ref1] = 32;
}
- }
- if( h->sh.b_mbaff )
- {
- for( i_ref0 = 2*h->i_ref0-1; i_ref0 >= 0; i_ref0-- )
- for( i_ref1 = 2*h->i_ref1-1; i_ref1 >= 0; i_ref1-- )
- h->mb.bipred_weight[i_ref0][i_ref1] = h->mb.bipred_weight[i_ref0>>1][i_ref1>>1];
- }
}
+
projects / x264 / blobdiff