Mercurial > libavcodec.hg
changeset 9000:78afc2990d00 libavcodec
Use context variable repeat_pict for frame duration computation and
document this new use.
Patch by Ivan Schreter, schreter gmx net
| author | cehoyos |
|---|---|
| date | Sat, 21 Feb 2009 20:11:47 +0000 |
| parents | f701dab6a62d |
| children | ec04c3c5a3e5 |
| files | avcodec.h h264_parser.c |
| diffstat | 2 files changed, 41 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Sat Feb 21 20:03:05 2009 +0000 +++ b/avcodec.h Sat Feb 21 20:11:47 2009 +0000 @@ -3005,6 +3005,18 @@ int64_t next_frame_offset; /* offset of the next frame */ /* video info */ int pict_type; /* XXX: Put it back in AVCodecContext. */ + /** + * This field is used for proper frame duration computation in lavf. + * It signals, how much longer the frame duration of the current frame + * is compared to normal frame duration. + * + * frame_duration = (2 + repeat_pict) / (2*fps) + * + * It is used by codecs like H.264 to display telecined material. + * + * @note This field can also be set to -1 for half-frame duration in case + * of field pictures. + */ int repeat_pict; /* XXX: Put it back in AVCodecContext. */ int64_t pts; /* pts of the current frame */ int64_t dts; /* dts of the current frame */
--- a/h264_parser.c Sat Feb 21 20:03:05 2009 +0000 +++ b/h264_parser.c Sat Feb 21 20:11:47 2009 +0000 @@ -192,6 +192,35 @@ } } + if(h->sps.pic_struct_present_flag) { + switch (h->sei_pic_struct) { + case SEI_PIC_STRUCT_TOP_FIELD: + case SEI_PIC_STRUCT_BOTTOM_FIELD: + s->repeat_pict = -1; + break; + case SEI_PIC_STRUCT_FRAME: + case SEI_PIC_STRUCT_TOP_BOTTOM: + case SEI_PIC_STRUCT_BOTTOM_TOP: + s->repeat_pict = 0; + break; + case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + s->repeat_pict = 1; + break; + case SEI_PIC_STRUCT_FRAME_DOUBLING: + s->repeat_pict = 2; + break; + case SEI_PIC_STRUCT_FRAME_TRIPLING: + s->repeat_pict = 4; + break; + default: + s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 0 : -1; + break; + } + } else { + s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 0 : -1; + } + return 0; /* no need to evaluate the rest */ } buf += consumed;