comparison sub/spudec.c @ 37172:cad608ae7295

Fix incorrect use of pal2gray_alpha for av_sub. It would clear previously draw subtitle rectangles at the same vertical position, and it could potentially write outside the destination.

37171:29802bb119f6

 *            gray value <= 256 - alpha.
 */
static void pal2gray_alpha(const uint16_t *pal,
                           const uint8_t *src, int src_stride,
                           uint8_t *dst, uint8_t *dsta,
                           int dst_stride, int w, int h)
{
  int x, y;
  for (y = 0; y < h; y++) {
    for (x = 0; x < w; x++) {
      uint16_t pixel = pal[src[x]];
      *dst++  = pixel;
      *dsta++ = pixel >> 8;
    }
    for (; x < dst_stride; x++)
      *dsta++ = *dst++ = 0;
    src += src_stride;
  }
}

    pal[i] = (-alpha << 8) | color;
  }
  src = this->pal_image + crop_y * this->pal_width + crop_x;
  pal2gray_alpha(pal, src, this->pal_width,
                 this->image, this->aimage, stride,
                 crop_w, crop_h);
  this->width  = crop_w;
  this->height = crop_h;
  this->stride = stride;
  this->start_col = this->pal_start_col + crop_x;
  this->start_row = this->pal_start_row + crop_y;

                  ((pixel & 0x00ff0000) >> 16)) >> 2;
      gray = FFMIN(gray, alpha);
      g8a8_pal[i] = (-alpha << 8) | gray;
  }
  pal2gray_alpha(g8a8_pal, pal_img, pal_stride,
                 img, aimg, packet->stride, w, h);
}

void spudec_packet_send(void *spu, packet_t *packet, double pts, double endpts)
{
  packet->start_pts = 0;

37172:cad608ae7295

 *            gray value <= 256 - alpha.
 */
static void pal2gray_alpha(const uint16_t *pal,
                           const uint8_t *src, int src_stride,
                           uint8_t *dst, uint8_t *dsta,
                           int dst_stride, int w, int h, int skip_stride)
{
  int x, y;
  for (y = 0; y < h; y++) {
    for (x = 0; x < w; x++) {
      uint16_t pixel = pal[src[x]];
      *dst++  = pixel;
      *dsta++ = pixel >> 8;
    }
    if (skip_stride) {
      dst += dst_stride - w;
      dsta += dst_stride - w;
    } else for (; x < dst_stride; x++)
      *dsta++ = *dst++ = 0;
    src += src_stride;
  }
}

    pal[i] = (-alpha << 8) | color;
  }
  src = this->pal_image + crop_y * this->pal_width + crop_x;
  pal2gray_alpha(pal, src, this->pal_width,
                 this->image, this->aimage, stride,
                 crop_w, crop_h, 0);
  this->width  = crop_w;
  this->height = crop_h;
  this->stride = stride;
  this->start_col = this->pal_start_col + crop_x;
  this->start_row = this->pal_start_row + crop_y;

                  ((pixel & 0x00ff0000) >> 16)) >> 2;
      gray = FFMIN(gray, alpha);
      g8a8_pal[i] = (-alpha << 8) | gray;
  }
  pal2gray_alpha(g8a8_pal, pal_img, pal_stride,
                 img, aimg, packet->stride, w, h, 1);
}

void spudec_packet_send(void *spu, packet_t *packet, double pts, double endpts)
{
  packet->start_pts = 0;