[vlc-commits] [Git][videolan/vlc][master] 3 commits: vdpau/chroma: remove always false condition

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
de1bdfd4 by Steve Lhomme at 2021-09-18T16:30:20+00:00
vdpau/chroma: remove always false condition

sys->history[MAX_PAST + MAX_FUTURE] is set a few lines above and can't be NULL
otherwise it would crash on the src->context check above.

It can't be NULL since at least 47c9655e19e6034fbd60bea3fb1caf5e3166e009.

- - - - -
3c829a47 by Steve Lhomme at 2021-09-18T16:30:20+00:00
vdpau/chroma: copy the b_still status of the source picture

- - - - -
0af664b0 by Steve Lhomme at 2021-09-18T16:30:20+00:00
vdpau/chroma: always use the history

No need to skip it with "forced" pictures otherwise the filter is no applied.

- - - - -


1 changed file:

- modules/hw/vdpau/chroma.c


Changes:

=====================================
modules/hw/vdpau/chroma.c
=====================================
@@ -463,12 +463,7 @@ static picture_t *Render(filter_t *filter, picture_t *src, bool import)
 
     picture_t *pic_f = sys->history[MAX_PAST];
     if (pic_f == NULL)
-    {   /* There is no present field, probably just starting playback. */
-        if (!sys->history[MAX_PAST + MAX_FUTURE] ||
-            !sys->history[MAX_PAST + MAX_FUTURE]->b_force)
-            goto skip;
-
-        /* If the picture is forced, ignore deinterlacing and fast forward. */
+    {   /* If the picture is forced, ignore deinterlacing and fast forward. */
         /* FIXME: Remove the forced hack pictures in video output core and
          * allow the last field of a video to be rendered properly. */
         while (sys->history[MAX_PAST] == NULL)
@@ -501,6 +496,7 @@ static picture_t *Render(filter_t *filter, picture_t *src, bool import)
     assert(p_sys != NULL && p_sys->vdp == sys->vdp);
     dst->date = pic_f->date;
     dst->b_force = pic_f->b_force;
+    dst->b_still = pic_f->b_still;
 
     /* Enable/Disable features */
     vlc_vdp_video_field_t *f = VDPAU_FIELD_FROM_PICCTX(pic_f->context);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b4eff1ccc01302a057f8348c626514b2ed4207d...0af664b02dea9fb05d370c125e2764786cd4681f

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b4eff1ccc01302a057f8348c626514b2ed4207d...0af664b02dea9fb05d370c125e2764786cd4681f
You're receiving this email because of your account on code.videolan.org.