← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to gui/gtk/gtk_glue_agg_vaapi.cpp

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/gtk/gtk_glue_agg_vaapi.cpp
160
160
{
161
161
    VaapiGlobalContext *const gvactx = VaapiGlobalContext::get();
162
162
    if (!gvactx) {
163
 
        log_debug(_("WARNING: failed to create VA-API display."));
 
163
        log_error(_("WARNING: failed to create VA-API display."));
164
164
        return false;
165
165
    }
166
166
    return true;
201
201
    const char *agg_pixel_format;
202
202
    agg_pixel_format = find_pixel_format(_vaapi_image_format);
203
203
    if (!agg_pixel_format) {
204
 
        log_debug("GTK-AGG: Unknown RGB format %s reported by VA-API."
205
 
                  "  Please report this to the gnash-dev "
206
 
                  "mailing list.", string_of_FOURCC(_vaapi_image_format));
 
204
        log_error(_("GTK-AGG: Unknown RGB format %s reported by VA-API."
 
205
                    "Please report this to the gnash-dev mailing list."),
 
206
                  string_of_FOURCC(_vaapi_image_format));
207
207
        return NULL;
208
208
    }
209
209
 
218
218
    /* XXX: round up to 128-byte boundaries to workaround GMA500 bugs */
219
219
    const unsigned int aligned_width = (width + 31) & -32U;
220
220
 
221
 
    dprintf("GtkAggVaapiGlue::resetRenderSurface(): size %ux%u\n",
222
 
            width, height);
 
221
    // dprintf("GtkAggVaapiGlue::resetRenderSurface(): size %ux%u\n",
 
222
    //         width, height);
223
223
 
224
224
    _vaapi_surface.reset(new VaapiSurface(width, height));
225
225
    _vaapi_image.reset(new VaapiImage(aligned_width, height, _vaapi_image_format));
228
228
    _vaapi_subpicture.reset(new VaapiSubpicture(_vaapi_image));
229
229
 
230
230
    if (!_vaapi_image->map()) {
231
 
        log_debug(_("ERROR: failed to map VA-API image."));
 
231
        log_error(_("failed to map VA-API image."));
232
232
        return;
233
233
    }
234
234
 
235
235
    VaapiRectangle r(width, height);
236
236
    if (!_vaapi_surface->associateSubpicture(_vaapi_subpicture, r, r)) {
237
 
        log_debug(_("ERROR: failed to associate VA-API subpicture."));
 
237
        log_error(_("failed to associate VA-API subpicture."));
238
238
        return;
239
239
    }
240
240
    _vaapi_surface->clear();
286
286
        resetRenderSurface(_window_width, _window_height);
287
287
 
288
288
    if (!_vaapi_image->map()) {
289
 
        log_debug(_("ERROR: failed to map VA-API image."));
 
289
        log_error(_("failed to map VA-API image."));
290
290
        return;
291
291
    }
292
292
}
368
368
             VaapiVideoWindow *videoWindow;
369
369
             videoWindow = getVideoWindow(surface, _drawing_area->window, dst_rect);
370
370
             if (!videoWindow) {
371
 
                 log_debug(_("ERROR: failed to setup video window for surface 0x%08x."), surface->get());
 
371
                 log_error(_("failed to setup video window for surface 0x%08x."), surface->get());
372
372
                 continue;
373
373
             }
374
374
             videoWindow->moveResize(dst_rect);
375
375
 
376
376
             VaapiRectangle pic_rect(surface->width(), surface->height());
377
377
             if (!surface->associateSubpicture(_vaapi_subpicture, src_rect, pic_rect)) {
378
 
                 log_debug(_("ERROR: failed to associate subpicture to surface 0x%08x."), surface->get());
 
378
                 log_error(_("failed to associate subpicture to surface 0x%08x."), surface->get());
379
379
                 continue;
380
380
             }
381
381