nvc0: allow frame dropping in h264
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Mon, 1 Jul 2013 06:47:49 +0000 (08:47 +0200)
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>
Mon, 1 Jul 2013 06:47:49 +0000 (08:47 +0200)
The only reason the checks existed were paranoia, when I first
wrote the code I wasn't sure it was correct. Now that I am,
the asserts triggered when XBMC was dropping frames, so remove it.

NOTE: This is a candidate for the 9.1 branch.

src/gallium/drivers/nvc0/nvc0_video_vp.c

index 1ecdd2d91f033f8c13efd91d18100a5e32d7e2be..c5d4f9418dae78281b9f9ecb713690c8bf12550a 100644 (file)
@@ -185,8 +185,6 @@ nvc0_decoder_handle_references(struct nvc0_decoder *dec, struct nvc0_video_buffe
               (!dec->refs[idx].decoded_bottom || !dec->refs[idx].decoded_top)));
       if (target == refs[i])
          empty_spot = 0;
-      assert(!h264 ||
-             dec->refs[idx].last_used == seq - 1);
 
       if (dec->refs[idx].vidbuf != refs[i]) {
          debug_printf("%p is not a real ref\n", refs[i]);
@@ -338,7 +336,6 @@ nvc0_decoder_fill_picparm_h264_vp(struct nvc0_decoder *dec,
    unsigned ring, i, j = 0;
    assert(offsetof(struct h264_picparm_vp, u224) == 0x224);
    *is_ref = d->is_reference;
-   assert(!d->frame_num || dec->last_frame_num + 1 == d->frame_num || dec->last_frame_num == d->frame_num);
    dec->last_frame_num = d->frame_num;
 
    h->width = mb(dec->base.width);