diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-01 08:47:49 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-01 08:47:49 +0200 |
| commit | bf95ca7de0c02a00a75d1d5e2693a33b68ff784d (patch) | |
| tree | 996d7fcc6203cdfea4f60dfc76c6b6e845b20895 | |
| parent | 24fa43675f32bc81c7252f3ddce4c80ed8c7737d (diff) | |
| download | external_mesa3d-bf95ca7de0c02a00a75d1d5e2693a33b68ff784d.zip external_mesa3d-bf95ca7de0c02a00a75d1d5e2693a33b68ff784d.tar.gz external_mesa3d-bf95ca7de0c02a00a75d1d5e2693a33b68ff784d.tar.bz2 | |
nvc0: allow frame dropping in h264
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.
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_video_vp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_video_vp.c b/src/gallium/drivers/nvc0/nvc0_video_vp.c index 1ecdd2d..c5d4f94 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_vp.c +++ b/src/gallium/drivers/nvc0/nvc0_video_vp.c @@ -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); |