Attachment 605547 Details for Bug 849486 – patch against master

[patch] patch against master

0001-Added-flash-workarounds.patch (text/plain), 9.01 KB, created by Julian Sikorski on 2012-08-19 23:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Sikorski

Created: 2012-08-19 23:20:16 UTC

Size: 9.01 KB

patch

obsolete

>From 4e6f64d6e17ba902b3b86d4f1b31cc878130c595 Mon Sep 17 00:00:00 2001
>From: Julian Sikorski <belegdol@fedoraproject.org>
>Date: Mon, 20 Aug 2012 00:59:18 +0200
>Subject: [PATCH] Added flash workarounds
>
>---
> flash-workarounds.patch | 254 ++++++++++++++++++++++++++++++++++++++++++++++++
> libvdpau.spec           |   8 +-
> 2 files changed, 261 insertions(+), 1 deletion(-)
> create mode 100644 flash-workarounds.patch
>
>diff --git a/flash-workarounds.patch b/flash-workarounds.patch
>new file mode 100644
>index 0000000..aa14905
>--- /dev/null
>+++ b/flash-workarounds.patch
>@@ -0,0 +1,254 @@
>+From 0cef65f53d836e8cfdb01e58d0df58743badba71 Mon Sep 17 00:00:00 2001
>+From: Stephen Warren <swarren@wwwdotorg.org>
>+Date: Wed, 02 May 2012 03:27:24 +0000
>+Subject: Implement workarounds for Adobe Flash bugs
>+
>+Implement two workarounds:
>+
>+1) Swap U and V planes to VdpVideoSurfacePutBitsYCbCr to fix blue-tinged
>+   videos.
>+
>+2) Disable VdpPresentationQueueSetBackgroundColor, so that Flash doesn't
>+   set the background to pure black or pure white, which would cause the
>+   VDPAU image to bleed through to other parts of the desktop with those
>+   very common colors.
>+
>+These workarounds are only enabled when running under Flash player, and
>+may be individually controlled via /etc/vdpau_wrapper.cfg, should they
>+ever need to be disabled.
>+
>+Note that this code stores the VDPAU backend function pointers as global
>+variables, which is technically incorrect. However, the likelihood of
>+any known VDPAU implementation ever returning different values for these
>+pointers within a single process is zero. If this becomes a problem, a
>+has table of VdpDevice to the stored pointers should be implemented.
>+
>+Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
>+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
>+---
>+diff --git a/src/Makefile.am b/src/Makefile.am
>+index 48e69a7..9162ffb 100644
>+--- a/src/Makefile.am
>++++ b/src/Makefile.am
>+@@ -1,6 +1,7 @@
>+ AM_CFLAGS = \
>+     -I$(top_srcdir)/include \
>+     -DVDPAU_MODULEDIR="\"$(moduledir)\"" \
>++    -DVDPAU_SYSCONFDIR="\"$(sysconfdir)\"" \
>+     $(X11_CFLAGS) \
>+     $(XEXT_CFLAGS)
>+ 
>+@@ -26,3 +27,6 @@ libvdpauincludedir = $(includedir)/vdpau
>+ libvdpauinclude_HEADERS = \
>+     $(top_srcdir)/include/vdpau/vdpau.h \
>+     $(top_srcdir)/include/vdpau/vdpau_x11.h
>++
>++libvdpausysconfdir=$(sysconfdir)
>++libvdpausysconf_DATA = vdpau_wrapper.cfg
>+diff --git a/src/vdpau_wrapper.c b/src/vdpau_wrapper.c
>+index 23de3d4..c955745 100644
>+--- a/src/vdpau_wrapper.c
>++++ b/src/vdpau_wrapper.c
>+@@ -210,6 +210,163 @@ static void _vdp_close_driver(void)
>+     _vdp_imp_device_create_x11_proc = NULL;
>+ }
>+ 
>++static VdpGetProcAddress * _imp_get_proc_address;
>++static VdpVideoSurfacePutBitsYCbCr * _imp_vid_put_bits_y_cb_cr;
>++static VdpPresentationQueueSetBackgroundColor * _imp_pq_set_bg_color;
>++static int _inited_fixes;
>++static int _running_under_flash;
>++static int _enable_flash_uv_swap = 1;
>++static int _disable_flash_pq_bg_color = 1;
>++
>++static VdpStatus vid_put_bits_y_cb_cr_swapped(
>++    VdpVideoSurface      surface,
>++    VdpYCbCrFormat       source_ycbcr_format,
>++    void const * const * source_data,
>++    uint32_t const *     source_pitches
>++)
>++{
>++    void const * data_reordered[3];
>++    void const * const * data;
>++
>++    if (source_ycbcr_format == VDP_YCBCR_FORMAT_YV12) {
>++        data_reordered[0] = source_data[0];
>++        data_reordered[1] = source_data[2];
>++        data_reordered[2] = source_data[1];
>++        /*
>++         * source_pitches[1] and source_pitches[2] should be equal,
>++         * so no need to re-order.
>++         */
>++        data = data_reordered;
>++    }
>++    else {
>++        data = source_data;
>++    }
>++    
>++    return _imp_vid_put_bits_y_cb_cr(
>++        surface,
>++        source_ycbcr_format,
>++        data,
>++        source_pitches
>++    );
>++}
>++
>++static VdpStatus pq_set_bg_color_noop(
>++    VdpPresentationQueue presentation_queue,
>++    VdpColor * const     background_color
>++)
>++{
>++    return VDP_STATUS_OK;
>++}
>++
>++static VdpStatus vdp_wrapper_get_proc_address(
>++    VdpDevice device,
>++    VdpFuncId function_id,
>++    /* output parameters follow */
>++    void * *  function_pointer
>++)
>++{
>++    VdpStatus status;
>++
>++    status = _imp_get_proc_address(device, function_id, function_pointer);
>++    if (status != VDP_STATUS_OK) {
>++        return status;
>++    }
>++
>++    if (_running_under_flash) {
>++        switch (function_id) {
>++        case VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR:
>++            if (_enable_flash_uv_swap) {
>++                _imp_vid_put_bits_y_cb_cr = *function_pointer;
>++                *function_pointer = vid_put_bits_y_cb_cr_swapped;
>++            }
>++            break;
>++        case VDP_FUNC_ID_PRESENTATION_QUEUE_SET_BACKGROUND_COLOR:
>++            if (_disable_flash_pq_bg_color) {
>++                _imp_pq_set_bg_color = *function_pointer;
>++                *function_pointer = pq_set_bg_color_noop;
>++            }
>++            break;
>++        default:
>++            break;
>++        }
>++    }
>++
>++    return VDP_STATUS_OK;
>++}
>++
>++static void init_running_under_flash(void)
>++{
>++    FILE *fp;
>++    char buffer[1024];
>++    int ret, i;
>++
>++    fp = fopen("/proc/self/cmdline", "r");
>++    if (!fp) {
>++        return;
>++    }
>++    ret = fread(buffer, 1, sizeof(buffer) - 1, fp);
>++    fclose(fp);
>++    if (ret < 0) {
>++        return;
>++    }
>++    /*
>++     * Sometimes the file contains null between arguments. Wipe these out so
>++     * strstr doesn't stop early.
>++     */
>++    for (i = 0; i < ret; i++) {
>++        if (buffer[i] == '\0') {
>++            buffer[i] = 'x';
>++        }
>++    }
>++    buffer[ret] = '\0';
>++
>++    if (strstr(buffer, "libflashplayer") != NULL) {
>++        _running_under_flash = 1;
>++    }
>++}
>++
>++void init_config(void)
>++{
>++    FILE *fp;
>++    char buffer[1024];
>++    int ret;
>++
>++    fp = fopen(VDPAU_SYSCONFDIR "/vdpau_wrapper.cfg", "r");
>++    if (!fp) {
>++        return;
>++    }
>++
>++    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
>++        char * equals = strchr(buffer, '=');
>++        char * param;
>++
>++        if (equals == NULL) {
>++            continue;
>++        }
>++
>++        *equals = '\0';
>++        param = equals + 1;
>++
>++        if (!strcmp(buffer, "enable_flash_uv_swap")) {
>++            _enable_flash_uv_swap = atoi(param);
>++        }
>++        else if (!strcmp(buffer, "disable_flash_pq_bg_color")) {
>++            _disable_flash_pq_bg_color = atoi(param);
>++        }
>++    }
>++}
>++
>++void init_fixes(void)
>++{
>++    if (_inited_fixes) {
>++        return;
>++    }
>++    _inited_fixes = 1;
>++
>++    init_running_under_flash();
>++    init_config();
>++}
>++
>+ VdpStatus vdp_device_create_x11(
>+     Display *             display,
>+     int                   screen,
>+@@ -220,6 +377,8 @@ VdpStatus vdp_device_create_x11(
>+ {
>+     VdpStatus status;
>+ 
>++    init_fixes();
>++
>+     if (!_vdp_imp_device_create_x11_proc) {
>+         status = _vdp_open_driver(display, screen);
>+         if (status != VDP_STATUS_OK) {
>+@@ -228,10 +387,17 @@ VdpStatus vdp_device_create_x11(
>+         }
>+     }
>+ 
>+-    return _vdp_imp_device_create_x11_proc(
>++    status = _vdp_imp_device_create_x11_proc(
>+         display,
>+         screen,
>+         device,
>+-        get_proc_address
>++        &_imp_get_proc_address
>+     );
>++    if (status != VDP_STATUS_OK) {
>++        return status;
>++    }
>++
>++    *get_proc_address = vdp_wrapper_get_proc_address;
>++
>++    return VDP_STATUS_OK;
>+ }
>+diff --git a/src/vdpau_wrapper.cfg b/src/vdpau_wrapper.cfg
>+new file mode 100644
>+index 0000000..21d5b8c
>+--- a/dev/null
>++++ b/src/vdpau_wrapper.cfg
>+@@ -0,0 +1,2 @@
>++enable_flash_uv_swap=1
>++disable_flash_pq_bg_color=1
>+--
>+cgit v0.9.0.2-2-gbebe
>diff --git a/libvdpau.spec b/libvdpau.spec
>index 76d491e..ae61003 100644
>--- a/libvdpau.spec
>+++ b/libvdpau.spec
>@@ -1,6 +1,6 @@
> Name:           libvdpau
> Version:        0.4.1
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> Summary:        Wrapper library for the Video Decode and Presentation API
> 
> Group:          System Environment/Libraries
>@@ -8,6 +8,7 @@ License:        MIT
> URL:            http://freedesktop.org/wiki/Software/VDPAU
> Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.bz2
> Patch0:         libvdpau-backport.patch
>+Patch1:         flash-workarounds.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  libtool
>@@ -52,6 +53,7 @@ developing applications that use %{name}.
> %prep
> %setup -q
> %patch0 -p1
>+%patch1 -p1 -b .flash-workarounds
> autoreconf -vif
> 
> 
>@@ -81,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
> %files
> %defattr(-,root,root,-)
> %doc AUTHORS COPYING
>+%config(noreplace) %{_sysconfdir}/vdpau_wrapper.cfg
> %{_libdir}/*.so.*
> %dir %{_libdir}/vdpau
> %{_libdir}/vdpau/libvdpau_trace.so*
>@@ -99,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Sun Aug 19 2012 Julian Sikorski <belegdol@fedoraproject.org> - 0.4.1-9
>+- Added flash workarounds
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 849486: 605547