diff options
| -rw-r--r-- | libavcodec/hevc.h | 13 | ||||
| -rw-r--r-- | libavcodec/hevcdsp.c | 1 | ||||
| -rw-r--r-- | libavcodec/hevcdsp.h | 104 |
3 files changed, 68 insertions, 50 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index f26c6cb8b6..4842752820 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -663,19 +663,6 @@ typedef struct TransformUnit { uint8_t is_cu_qp_delta_coded; } TransformUnit; -typedef struct SAOParams { - int offset_abs[3][4]; ///< sao_offset_abs - int offset_sign[3][4]; ///< sao_offset_sign - - int band_position[3]; ///< sao_band_position - - int eo_class[3]; ///< sao_eo_class - - int offset_val[3][5]; ///<SaoOffsetVal - - uint8_t type_idx[3]; ///< sao_type_idx -} SAOParams; - typedef struct DBParams { int beta_offset; int tc_offset; diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c index b3abc9d8a5..be44bc9955 100644 --- a/libavcodec/hevcdsp.c +++ b/libavcodec/hevcdsp.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hevc.h" #include "hevcdsp.h" static const int8_t transform[32][32] = { diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h index c6511b01ac..4dd3ebd1ee 100644 --- a/libavcodec/hevcdsp.h +++ b/libavcodec/hevcdsp.h @@ -1,5 +1,5 @@ /* - * HEVC video Decoder + * HEVC video decoder * * Copyright (C) 2012 - 2013 Guillaume Martres * @@ -25,49 +25,81 @@ #include "get_bits.h" -struct SAOParams; +typedef struct SAOParams { + int offset_abs[3][4]; ///< sao_offset_abs + int offset_sign[3][4]; ///< sao_offset_sign -typedef struct HEVCDSPContext { - void (*put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int size, - GetBitContext *gb, int pcm_bit_depth); - - void (*transquant_bypass[4])(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride); - - void (*transform_skip)(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride); - - void (*transform_4x4_luma_add)(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride); + int band_position[3]; ///< sao_band_position - void (*transform_add[4])(uint8_t *dst, int16_t *coeffs, ptrdiff_t _stride); + int eo_class[3]; ///< sao_eo_class - void (*sao_band_filter[4])( uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride, struct SAOParams *sao, int *borders, int width, int height, int c_idx); + int offset_val[3][5]; ///<SaoOffsetVal - void (*sao_edge_filter[4])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride, struct SAOParams *sao, int *borders, int _width, int _height, int c_idx, uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge); + uint8_t type_idx[3]; ///< sao_type_idx +} SAOParams; +typedef struct HEVCDSPContext { + void (*put_pcm)(uint8_t *dst, ptrdiff_t stride, int size, + GetBitContext *gb, int pcm_bit_depth); - void (*put_hevc_qpel[4][4])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int width, int height, int16_t* mcbuffer); - - void (*put_hevc_epel[2][2])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int width, int height, int mx, int my, int16_t* mcbuffer); - - void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, - int width, int height); + void (*transquant_bypass[4])(uint8_t *dst, int16_t *coeffs, + ptrdiff_t stride); - void (*put_weighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride, int16_t *src1, int16_t *src2, - ptrdiff_t srcstride, int width, int height); - void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag, uint8_t *dst, ptrdiff_t dststride, int16_t *src, + void (*transform_skip)(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride); + void (*transform_4x4_luma_add)(uint8_t *dst, int16_t *coeffs, + ptrdiff_t stride); + void (*transform_add[4])(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride); + + void (*sao_band_filter[4])(uint8_t *dst, uint8_t *src, ptrdiff_t stride, + struct SAOParams *sao, int *borders, + int width, int height, int c_idx); + void (*sao_edge_filter[4])(uint8_t *dst, uint8_t *src, ptrdiff_t stride, + struct SAOParams *sao, int *borders, int width, + int height, int c_idx, uint8_t vert_edge, + uint8_t horiz_edge, uint8_t diag_edge); + + void (*put_hevc_qpel[4][4])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, + ptrdiff_t srcstride, int width, int height, + int16_t *mcbuffer); + void (*put_hevc_epel[2][2])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, + ptrdiff_t srcstride, int width, int height, + int mx, int my, int16_t *mcbuffer); + + void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src, + ptrdiff_t srcstride, int width, int height); + void (*put_weighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride, + int16_t *src1, int16_t *src2, ptrdiff_t srcstride, int width, int height); - void (*weighted_pred_avg)(uint8_t denom, int16_t wl0Flag, int16_t wl1Flag, int16_t ol0Flag, int16_t ol1Flag, - uint8_t *dst, ptrdiff_t dststride, int16_t *src1, int16_t *src2, - ptrdiff_t srcstride, int width, int height); - void (*hevc_h_loop_filter_luma)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_v_loop_filter_luma)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_h_loop_filter_chroma)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_v_loop_filter_chroma)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_h_loop_filter_luma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_v_loop_filter_luma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_h_loop_filter_chroma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); - void (*hevc_v_loop_filter_chroma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); + void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag, + uint8_t *dst, ptrdiff_t dststride, int16_t *src, + ptrdiff_t srcstride, int width, int height); + void (*weighted_pred_avg)(uint8_t denom, int16_t wl0Flag, int16_t wl1Flag, + int16_t ol0Flag, int16_t ol1Flag, uint8_t *dst, + ptrdiff_t dststride, int16_t *src1, int16_t *src2, + ptrdiff_t srcstride, int width, int height); + + void (*hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride, + int *beta, int *tc, + uint8_t *no_p, uint8_t *no_q); + void (*hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride, + int *beta, int *tc, + uint8_t *no_p, uint8_t *no_q); + void (*hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride, + int *tc, uint8_t *no_p, uint8_t *no_q); + void (*hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride, + int *tc, uint8_t *no_p, uint8_t *no_q); + void (*hevc_h_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride, + int *beta, int *tc, + uint8_t *no_p, uint8_t *no_q); + void (*hevc_v_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride, + int *beta, int *tc, + uint8_t *no_p, uint8_t *no_q); + void (*hevc_h_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride, + int *tc, uint8_t *no_p, + uint8_t *no_q); + void (*hevc_v_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride, + int *tc, uint8_t *no_p, + uint8_t *no_q); } HEVCDSPContext; void ff_hevc_dsp_init(HEVCDSPContext *hpc, int bit_depth); |