diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-12 16:06:58 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-12 19:01:43 +0200 |
| commit | bd3fd467febe92300e0ebf8ff13c193f9236479a (patch) | |
| tree | e2a4382598405ce35492ec3c69e007e36f9b5e6c /libavcodec/h264_parse.h | |
| parent | 65d5f32fd7d234a9b08e3743593de0a72af7c03c (diff) | |
| parent | c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8 (diff) | |
| download | ffmpeg-bd3fd467febe92300e0ebf8ff13c193f9236479a.tar.gz | |
Merge commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
* commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8':
h264: factor out calculating the POC count into a separate file
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264_parse.h')
| -rw-r--r-- | libavcodec/h264_parse.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 0fac629ea3..413f04d90b 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -39,6 +39,19 @@ typedef struct H264PredWeightTable { int implicit_weight[48][48][2]; } H264PredWeightTable; +typedef struct H264POCContext { + int poc_lsb; + int poc_msb; + int delta_poc_bottom; + int delta_poc[2]; + int frame_num; + int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 + int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 + int frame_num_offset; ///< for POC type 2 + int prev_frame_num_offset; ///< for POC type 2 + int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 +} H264POCContext; + struct SPS; struct PPS; @@ -65,4 +78,8 @@ int ff_h264_parse_ref_count(int *plist_count, int ref_count[2], GetBitContext *gb, const struct PPS *pps, int slice_type_nos, int picture_structure, void *logctx); +int ff_h264_init_poc(int pic_field_poc[2], int *pic_poc, + const struct SPS *sps, H264POCContext *poc, + int picture_structure, int nal_ref_idc); + #endif /* AVCODEC_H264_PARSE_H */ |