/*****************************************************************************
* frame.h: frame handling
*****************************************************************************
- * Copyright (C) 2003-2011 x264 project
+ * Copyright (C) 2003-2015 x264 project
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Loren Merritt <lorenm@u.washington.edu>
typedef struct x264_frame
{
/* */
+ uint8_t *base; /* Base pointer for all malloced data in this frame. */
int i_poc;
int i_delta_poc[2];
int i_type;
+ int i_forced_type;
int i_qpplus1;
int64_t i_pts;
int64_t i_dts;
uint8_t i_bframes; /* number of bframes following this nonb in coded order */
float f_qp_avg_rc; /* QPs as decided by ratecontrol */
float f_qp_avg_aq; /* QPs as decided by AQ in addition to ratecontrol */
+ float f_crf_avg; /* Average effective CRF for this frame */
int i_poc_l0ref0; /* poc of first refframe in L0, used to check if direct temporal is possible */
/* YUV buffer */
+ int i_csp; /* Internal csp */
int i_plane;
- int i_stride[2];
- int i_width[2];
- int i_lines[2];
+ int i_stride[3];
+ int i_width[3];
+ int i_lines[3];
int i_stride_lowres;
int i_width_lowres;
int i_lines_lowres;
- pixel *plane[2];
- pixel *plane_fld[2];
- pixel *filtered[4]; /* plane[0], H, V, HV */
- pixel *filtered_fld[4];
+ pixel *plane[3];
+ pixel *plane_fld[3];
+ pixel *filtered[3][4]; /* plane[0], H, V, HV */
+ pixel *filtered_fld[3][4];
pixel *lowres[4]; /* half-size copy of input frame: Orig, H, V, HV */
uint16_t *integral;
int16_t (*mv16x16)[2];
int16_t (*lowres_mvs[2][X264_BFRAME_MAX+1])[2];
uint8_t *field;
+ uint8_t *effective_qp;
/* Stored as (lists_used << LOWRES_COST_SHIFT) + (cost).
* Doesn't need special addressing for intra cost because
int *i_row_satd;
int *i_row_bits;
float *f_row_qp;
+ float *f_row_qscale;
float *f_qp_offset;
float *f_qp_offset_aq;
int b_intra_calculated;
int i_reference_count; /* number of threads using this frame (not necessarily the number of pointers) */
x264_pthread_mutex_t mutex;
x264_pthread_cond_t cv;
+ int i_slice_count; /* Atomically written to/read from with slice threads */
/* periodic intra refresh */
float f_pir_position;
/* user sei */
x264_sei_t extra_sei;
+
+ /* user data */
+ void *opaque;
+
+ /* user frame properties */
+ uint8_t *mb_info;
+ void (*mb_info_free)( void* );
+
+#if HAVE_OPENCL
+ x264_frame_opencl_t opencl;
+#endif
} x264_frame_t;
/* synchronized frame list */
x264_pthread_cond_t cv_empty; /* event signaling that the list became emptier */
} x264_sync_frame_list_t;
-typedef void (*x264_deblock_inter_t)( pixel *pix, int stride, int alpha, int beta, int8_t *tc0 );
-typedef void (*x264_deblock_intra_t)( pixel *pix, int stride, int alpha, int beta );
+typedef void (*x264_deblock_inter_t)( pixel *pix, intptr_t stride, int alpha, int beta, int8_t *tc0 );
+typedef void (*x264_deblock_intra_t)( pixel *pix, intptr_t stride, int alpha, int beta );
typedef struct
{
x264_deblock_inter_t deblock_luma[2];
x264_deblock_inter_t deblock_chroma[2];
+ x264_deblock_inter_t deblock_h_chroma_420;
+ x264_deblock_inter_t deblock_h_chroma_422;
x264_deblock_intra_t deblock_luma_intra[2];
x264_deblock_intra_t deblock_chroma_intra[2];
+ x264_deblock_intra_t deblock_h_chroma_420_intra;
+ x264_deblock_intra_t deblock_h_chroma_422_intra;
+ x264_deblock_inter_t deblock_luma_mbaff;
+ x264_deblock_inter_t deblock_chroma_mbaff;
+ x264_deblock_inter_t deblock_chroma_420_mbaff;
+ x264_deblock_inter_t deblock_chroma_422_mbaff;
+ x264_deblock_intra_t deblock_luma_intra_mbaff;
+ x264_deblock_intra_t deblock_chroma_intra_mbaff;
+ x264_deblock_intra_t deblock_chroma_420_intra_mbaff;
+ x264_deblock_intra_t deblock_chroma_422_intra_mbaff;
void (*deblock_strength) ( uint8_t nnz[X264_SCAN8_SIZE], int8_t ref[2][X264_SCAN8_LUMA_SIZE],
- int16_t mv[2][X264_SCAN8_LUMA_SIZE][2], uint8_t bs[2][4][4], int mvy_limit,
+ int16_t mv[2][X264_SCAN8_LUMA_SIZE][2], uint8_t bs[2][8][4], int mvy_limit,
int bframe );
} x264_deblock_function_t;
-x264_frame_t *x264_frame_new( x264_t *h, int b_fdec );
void x264_frame_delete( x264_frame_t *frame );
int x264_frame_copy_picture( x264_t *h, x264_frame_t *dst, x264_picture_t *src );
-void x264_frame_expand_border( x264_t *h, x264_frame_t *frame, int mb_y, int b_end );
+void x264_frame_expand_border( x264_t *h, x264_frame_t *frame, int mb_y );
void x264_frame_expand_border_filtered( x264_t *h, x264_frame_t *frame, int mb_y, int b_end );
void x264_frame_expand_border_lowres( x264_frame_t *frame );
+void x264_frame_expand_border_chroma( x264_t *h, x264_frame_t *frame, int plane );
void x264_frame_expand_border_mod16( x264_t *h, x264_frame_t *frame );
+void x264_expand_border_mbpair( x264_t *h, int mb_x, int mb_y );
void x264_frame_deblock_row( x264_t *h, int mb_y );
void x264_macroblock_deblock( x264_t *h );
void x264_frame_filter( x264_t *h, x264_frame_t *frame, int mb_y, int b_end );
void x264_frame_init_lowres( x264_t *h, x264_frame_t *frame );
-void x264_deblock_init( int cpu, x264_deblock_function_t *pf );
+void x264_deblock_init( int cpu, x264_deblock_function_t *pf, int b_mbaff );
void x264_frame_cond_broadcast( x264_frame_t *frame, int i_lines_completed );
void x264_frame_cond_wait( x264_frame_t *frame, int i_lines_completed );
+int x264_frame_new_slice( x264_t *h, x264_frame_t *frame );
+
+void x264_threadslice_cond_broadcast( x264_t *h, int pass );
+void x264_threadslice_cond_wait( x264_t *h, int pass );
void x264_frame_push( x264_frame_t **list, x264_frame_t *frame );
x264_frame_t *x264_frame_pop( x264_frame_t **list );
void x264_frame_push_unused( x264_t *h, x264_frame_t *frame );
void x264_frame_push_blank_unused( x264_t *h, x264_frame_t *frame );
x264_frame_t *x264_frame_pop_blank_unused( x264_t *h );
-void x264_weight_scale_plane( x264_t *h, pixel *dst, int i_dst_stride, pixel *src, int i_src_stride,
+void x264_weight_scale_plane( x264_t *h, pixel *dst, intptr_t i_dst_stride, pixel *src, intptr_t i_src_stride,
int i_width, int i_height, x264_weight_t *w );
x264_frame_t *x264_frame_pop_unused( x264_t *h, int b_fdec );
-void x264_frame_sort( x264_frame_t **list, int b_dts );
void x264_frame_delete_list( x264_frame_t **list );
int x264_sync_frame_list_init( x264_sync_frame_list_t *slist, int nelem );
void x264_sync_frame_list_push( x264_sync_frame_list_t *slist, x264_frame_t *frame );
x264_frame_t *x264_sync_frame_list_pop( x264_sync_frame_list_t *slist );
-#define x264_frame_sort_dts(list) x264_frame_sort(list, 1)
-#define x264_frame_sort_pts(list) x264_frame_sort(list, 0)
-
#endif
projects / x264 / blobdiff