comparison libvo/vo_gl.c @ 29524:b1a437cdc60d

Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.

29523:00f8d4ca123f

  glViewport( 0, 0, x, y );

  glMatrixMode(GL_PROJECTION);
  glLoadIdentity();
  ass_border_x = ass_border_y = 0;
  if (vo_fs && use_aspect) {
    int new_w, new_h;
    GLdouble scale_x, scale_y;
    aspect(&new_w, &new_h, A_ZOOM);
    panscan_calc();
    new_w += vo_panscan_x;
    new_h += vo_panscan_y;
    scale_x = (GLdouble)new_w / (GLdouble)x;
    scale_y = (GLdouble)new_h / (GLdouble)y;
    glScaled(scale_x, scale_y, 1);

static void flip_page(void) {
  if (vo_doublebuffering) {
    if (use_glFinish) glFinish();
    swapGlBuffers();
    if (vo_fs && use_aspect)
      glClear(GL_COLOR_BUFFER_BIT);
  } else {
    do_render();
    do_render_osd(3);
    if (use_glFinish) glFinish();

    {
      mp_eosd_res_t *r = data;
      r->w = vo_dwidth; r->h = vo_dheight;
      r->mt = r->mb = r->ml = r->mr = 0;
      if (scaled_osd) {r->w = image_width; r->h = image_height;}
      else if (vo_fs) {
        r->ml = r->mr = ass_border_x;
        r->mt = r->mb = ass_border_y;
      }
    }
    return VO_TRUE;

29524:b1a437cdc60d

  glViewport( 0, 0, x, y );

  glMatrixMode(GL_PROJECTION);
  glLoadIdentity();
  ass_border_x = ass_border_y = 0;
  if (aspect_scaling() && use_aspect) {
    int new_w, new_h;
    GLdouble scale_x, scale_y;
    aspect(&new_w, &new_h, A_WINZOOM);
    panscan_calc_windowed();
    new_w += vo_panscan_x;
    new_h += vo_panscan_y;
    scale_x = (GLdouble)new_w / (GLdouble)x;
    scale_y = (GLdouble)new_h / (GLdouble)y;
    glScaled(scale_x, scale_y, 1);

static void flip_page(void) {
  if (vo_doublebuffering) {
    if (use_glFinish) glFinish();
    swapGlBuffers();
    if (aspect_scaling() && use_aspect)
      glClear(GL_COLOR_BUFFER_BIT);
  } else {
    do_render();
    do_render_osd(3);
    if (use_glFinish) glFinish();

    {
      mp_eosd_res_t *r = data;
      r->w = vo_dwidth; r->h = vo_dheight;
      r->mt = r->mb = r->ml = r->mr = 0;
      if (scaled_osd) {r->w = image_width; r->h = image_height;}
      else if (aspect_scaling()) {
        r->ml = r->mr = ass_border_x;
        r->mt = r->mb = ass_border_y;
      }
    }
    return VO_TRUE;