avcodec/h264: avoid using lost frames as references

Fixes Ticket3386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f9d10a2f79ace0700d4ba362cfa1da7cdfc701b2..eccd6db4af583a97a4750bce1ca8e5dcb30e46ad 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3788,6 +3788,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
             h->prev_frame_num++;
             h->prev_frame_num        %= 1 << h->sps.log2_max_frame_num;
             h->cur_pic_ptr->frame_num = h->prev_frame_num;
+            h->cur_pic_ptr->invalid_gap = !h->sps.gaps_in_frame_num_allowed_flag;
             ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0);
             ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1);
             ret = ff_generate_sliding_window_mmcos(h, 1);

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 0ca4878345a017ae67d64c4cfc3128fe2ca37cb0..f3d3ae0cc45ab49130f86ef3b8da4e7945ef5735 100644 (file)
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -75,7 +75,7 @@ static int build_def_list(Picture *def, int def_len,
     int index = 0;
 
     while (i[0] < len || i[1] < len) {
-        while (i[0] < len && !(in[i[0]] && (in[i[0]]->reference & sel)))
+        while (i[0] < len && !(in[i[0]] && (in[i[0]]->reference & sel) && (!in[i[0]]->invalid_gap || sel==3)))
             i[0]++;
         while (i[1] < len && !(in[i[1]] && (in[i[1]]->reference & (sel ^ 3))))
             i[1]++;

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index afc9c51c0a45d3b62b310d036e553ef8b5f84ea0..8f7de9e90c9e19e90436784b2d217b58775553c2 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -204,6 +204,7 @@ typedef struct Picture{
     int reference;
     int shared;
     int recovered;              ///< Picture at IDR or recovery point + recovery count
+    int invalid_gap;
 
     int crop;
     int crop_left;