fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/vdpau: Revert "change the order in which filters are applied(v3)"

Browse source 
This reverts commit 09dff7ae2e.

Turned out this can cause some artifacts in the output. Let's revert
it for now until we have sorted out all issues.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Nayan Deshmukh <nayan26deshmukh@gmail.com>
This commit is contained in:
Christian König 2016-08-26 09:56:18 +02:00
parent 9c9f45b824
commit 77e4424106
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gallium/state_trackers/vdpau/mixer.c
View file

@ -240,8 +240,8 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
struct u_rect rect, clip, *prect, dirty_area;
unsigned i, layer = 0;
struct pipe_video_buffer *video_buffer;
struct pipe_sampler_view *sampler_view, **sampler_views;
struct pipe_surface *surface, **surfaces;
struct pipe_sampler_view *sampler_view;
struct pipe_surface *surface;
vlVdpVideoMixer *vmixer;
vlVdpSurface *surf;
@ -325,22 +325,6 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
}
}
surfaces = video_buffer->get_surfaces(video_buffer);
sampler_views = video_buffer->get_sampler_view_planes(video_buffer);
for(i = 0; i < VL_MAX_SURFACES; ++i) {
if(sampler_views[i] != NULL && surfaces[i] != NULL) {
if (vmixer->noise_reduction.filter)
vl_median_filter_render(vmixer->noise_reduction.filter,
sampler_views[i], surfaces[i]);
if (vmixer->sharpness.filter)
vl_matrix_filter_render(vmixer->sharpness.filter,
sampler_views[i], surfaces[i]);
}
}
prect = RectToPipe(video_source_rect, &rect);
if (!prect) {
rect.x0 = 0;
@ -410,6 +394,14 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
else {
vl_compositor_render(&vmixer->cstate, compositor, surface, &dirty_area, true);
if (vmixer->noise_reduction.filter)
vl_median_filter_render(vmixer->noise_reduction.filter,
sampler_view, surface);
if (vmixer->sharpness.filter)
vl_matrix_filter_render(vmixer->sharpness.filter,
sampler_view, surface);
if (vmixer->bicubic.filter)
vl_bicubic_filter_render(vmixer->bicubic.filter,
sampler_view, dst->surface,