Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec: Add output_picture_number to AVCodecParserContext

Browse source 
Set output_picture_number in H.264 parser.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Yusuke Nakamura 2013-08-02 18:16:48 +09:00 • committed by Diego Biurrun
parent 7950e519bb
commit a8b19271c3
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/APIchanges
View file

@ -13,6 +13,9 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2013-08-xx - xxxxxxx - lavc 55.11.0 - avcodec.h
Add output_picture_number to AVCodecParserContext.
2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h 2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h
Add MPEG-2 AAC profiles Add MPEG-2 AAC profiles

8
libavcodec/avcodec.h
View file

@ -3563,6 +3563,14 @@ typedef struct AVCodecParserContext {
* AV_PICTURE_STRUCTURE_TOP_FIELD. * AV_PICTURE_STRUCTURE_TOP_FIELD.
*/ */
enum AVPictureStructure picture_structure; enum AVPictureStructure picture_structure;
/**
* Picture number incremented in presentation or output order.
* This field may be reinitialized at the first picture of a new sequence.
*
* For example, this corresponds to H.264 PicOrderCnt.
*/
int output_picture_number;
} AVCodecParserContext; } AVCodecParserContext;
typedef struct AVCodecParser { typedef struct AVCodecParser {

3
libavcodec/h264.c
View file

@ -2717,8 +2717,7 @@ int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc)
pic_field_poc[0] = field_poc[0]; pic_field_poc[0] = field_poc[0];
if (h->picture_structure != PICT_TOP_FIELD) if (h->picture_structure != PICT_TOP_FIELD)
pic_field_poc[1] = field_poc[1]; pic_field_poc[1] = field_poc[1];
if (pic_poc) *pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]);
*pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]);
return 0; return 0;
} }

2
libavcodec/h264_parser.c
View file

@ -240,7 +240,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
h->delta_poc[1] = get_se_golomb(&h->gb); h->delta_poc[1] = get_se_golomb(&h->gb);
} }
ff_init_poc(h, field_poc, NULL); ff_init_poc(h, field_poc, &s->output_picture_number);
if (h->sps.pic_struct_present_flag) { if (h->sps.pic_struct_present_flag) {
switch (h->sei_pic_struct) { switch (h->sei_pic_struct) {

2
libavcodec/version.h
View file

@ -27,7 +27,7 @@
*/ */
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 10 #define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \