diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-03-21 18:14:31 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-03-28 10:48:31 +0300 |
commit | e481458bc308ee838deaeacac51929514762e7a7 (patch) | |
tree | 5ce061d8d1ffa62aded7fdac43e95ee00d8e5ea9 /libavcodec/h264.h | |
parent | 90ed6c5cf7f236bc9efb47c97b40358c666d1386 (diff) |
h264: factor out pred weight table parsing into a separate file
This will allow decoupling the parser from the decoder.
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 72ad3525b8..3fe5b9c7e5 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -33,6 +33,7 @@ #include "cabac.h" #include "error_resilience.h" #include "get_bits.h" +#include "h264_parse.h" #include "h264chroma.h" #include "h264dsp.h" #include "h264pred.h" @@ -329,17 +330,7 @@ typedef struct H264SliceContext { int slice_alpha_c0_offset; int slice_beta_offset; - // Weighted pred stuff - int use_weight; - int use_weight_chroma; - int luma_log2_weight_denom; - int chroma_log2_weight_denom; - int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag - int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag - // The following 2 can be changed to int8_t but that causes 10cpu cycles speedloss - int luma_weight[48][2][2]; - int chroma_weight[48][2][2][2]; - int implicit_weight[48][48][2]; + H264PredWeightTable pwt; int prev_mb_skipped; int next_mb_skipped; @@ -1085,7 +1076,6 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl); void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height); int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); -int ff_pred_weight_table(H264Context *h, H264SliceContext *sl); int ff_set_ref_count(H264Context *h, H264SliceContext *sl); int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl); |