mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-15 04:38:48 +02:00
calculate frame_num for recovery point "keyframe"
recovery points that have non-zero recovery_frame_cnt resulted in flagging incomplete frames as keyframes. This delays setting the keyframe flag till the frame has been fully constructed.
This commit is contained in:
parent
96c93b8ceb
commit
53e37840bf
@ -3714,9 +3714,19 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
|
|||||||
if((err = decode_slice_header(hx, h)))
|
if((err = decode_slice_header(hx, h)))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
if (h->sei_recovery_frame_cnt >= 0) {
|
||||||
|
h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) %
|
||||||
|
(1 << h->sps.log2_max_frame_num);
|
||||||
|
}
|
||||||
|
|
||||||
s->current_picture_ptr->f.key_frame |=
|
s->current_picture_ptr->f.key_frame |=
|
||||||
(hx->nal_unit_type == NAL_IDR_SLICE) ||
|
(hx->nal_unit_type == NAL_IDR_SLICE);
|
||||||
(h->sei_recovery_frame_cnt >= 0);
|
|
||||||
|
if (h->recovery_frame == h->frame_num) {
|
||||||
|
s->current_picture_ptr->f.key_frame |= 1;
|
||||||
|
h->recovery_frame = -1;
|
||||||
|
}
|
||||||
|
|
||||||
h->sync |= !!s->current_picture_ptr->f.key_frame;
|
h->sync |= !!s->current_picture_ptr->f.key_frame;
|
||||||
h->sync |= 3*!!(s->flags2 & CODEC_FLAG2_SHOW_ALL);
|
h->sync |= 3*!!(s->flags2 & CODEC_FLAG2_SHOW_ALL);
|
||||||
s->current_picture_ptr->sync = h->sync;
|
s->current_picture_ptr->sync = h->sync;
|
||||||
|
@ -571,6 +571,13 @@ typedef struct H264Context{
|
|||||||
* frames.
|
* frames.
|
||||||
*/
|
*/
|
||||||
int sei_recovery_frame_cnt;
|
int sei_recovery_frame_cnt;
|
||||||
|
/**
|
||||||
|
* recovery_frame is the frame_num at which the next frame should
|
||||||
|
* be fully constructed.
|
||||||
|
*
|
||||||
|
* Set to -1 when not expecting a recovery point.
|
||||||
|
*/
|
||||||
|
int recovery_frame;
|
||||||
|
|
||||||
int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag
|
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
|
int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag
|
||||||
|
Loading…
Reference in New Issue
Block a user