/media/libvpx/bug671818.patch

http://github.com/zpao/v8monkey · Patch · 162 lines · 148 code · 14 blank · 0 comment · 0 complexity · f4c5b36dccd06ea90ddddf511ce37e24 MD5 · raw file

  1. diff --git a/media/libvpx/vp8/vp8_dx_iface.c b/media/libvpx/vp8/vp8_dx_iface.c
  2. --- a/media/libvpx/vp8/vp8_dx_iface.c
  3. +++ b/media/libvpx/vp8/vp8_dx_iface.c
  4. @@ -315,16 +315,46 @@ update_error_state(vpx_codec_alg_priv_t
  5. if ((res = error->error_code))
  6. ctx->base.err_detail = error->has_detail
  7. ? error->detail
  8. : NULL;
  9. return res;
  10. }
  11. +static void yuvconfig2image(vpx_image_t *img,
  12. + const YV12_BUFFER_CONFIG *yv12,
  13. + void *user_priv)
  14. +{
  15. + /** vpx_img_wrap() doesn't allow specifying independent strides for
  16. + * the Y, U, and V planes, nor other alignment adjustments that
  17. + * might be representable by a YV12_BUFFER_CONFIG, so we just
  18. + * initialize all the fields.*/
  19. + img->fmt = yv12->clrtype == REG_YUV ?
  20. + VPX_IMG_FMT_I420 : VPX_IMG_FMT_VPXI420;
  21. + img->w = yv12->y_stride;
  22. + img->h = (yv12->y_height + 2 * VP8BORDERINPIXELS + 15) & ~15;
  23. + img->d_w = yv12->y_width;
  24. + img->d_h = yv12->y_height;
  25. + img->x_chroma_shift = 1;
  26. + img->y_chroma_shift = 1;
  27. + img->planes[VPX_PLANE_Y] = yv12->y_buffer;
  28. + img->planes[VPX_PLANE_U] = yv12->u_buffer;
  29. + img->planes[VPX_PLANE_V] = yv12->v_buffer;
  30. + img->planes[VPX_PLANE_ALPHA] = NULL;
  31. + img->stride[VPX_PLANE_Y] = yv12->y_stride;
  32. + img->stride[VPX_PLANE_U] = yv12->uv_stride;
  33. + img->stride[VPX_PLANE_V] = yv12->uv_stride;
  34. + img->stride[VPX_PLANE_ALPHA] = yv12->y_stride;
  35. + img->bps = 12;
  36. + img->user_priv = user_priv;
  37. + img->img_data = yv12->buffer_alloc;
  38. + img->img_data_owner = 0;
  39. + img->self_allocd = 0;
  40. +}
  41. static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
  42. const uint8_t *data,
  43. unsigned int data_sz,
  44. void *user_priv,
  45. long deadline)
  46. {
  47. vpx_codec_err_t res = VPX_CODEC_OK;
  48. @@ -424,30 +454,18 @@ static vpx_codec_err_t vp8_decode(vpx_co
  49. if (vp8dx_receive_compressed_data(ctx->pbi, data_sz, data, deadline))
  50. {
  51. VP8D_COMP *pbi = (VP8D_COMP *)ctx->pbi;
  52. res = update_error_state(ctx, &pbi->common.error);
  53. }
  54. if (!res && 0 == vp8dx_get_raw_frame(ctx->pbi, &sd, &time_stamp, &time_end_stamp, ppdeblocking, ppnoise, ppflag))
  55. {
  56. - /* Align width/height */
  57. - unsigned int a_w = (sd.y_width + 15) & ~15;
  58. - unsigned int a_h = (sd.y_height + 15) & ~15;
  59. -
  60. - vpx_img_wrap(&ctx->img, VPX_IMG_FMT_I420,
  61. - a_w + 2 * VP8BORDERINPIXELS,
  62. - a_h + 2 * VP8BORDERINPIXELS,
  63. - 1,
  64. - sd.buffer_alloc);
  65. - vpx_img_set_rect(&ctx->img,
  66. - VP8BORDERINPIXELS, VP8BORDERINPIXELS,
  67. - sd.y_width, sd.y_height);
  68. + yuvconfig2image(&ctx->img, &sd, user_priv);
  69. ctx->img_avail = 1;
  70. -
  71. }
  72. }
  73. return res;
  74. }
  75. static vpx_image_t *vp8_get_frame(vpx_codec_alg_priv_t *ctx,
  76. vpx_codec_iter_t *iter)
  77. diff --git a/media/libvpx/vpx_scale/generic/yv12config.c b/media/libvpx/vpx_scale/generic/yv12config.c
  78. --- a/media/libvpx/vpx_scale/generic/yv12config.c
  79. +++ b/media/libvpx/vpx_scale/generic/yv12config.c
  80. @@ -42,50 +42,61 @@ vp8_yv12_de_alloc_frame_buffer(YV12_BUFF
  81. /****************************************************************************
  82. *
  83. ****************************************************************************/
  84. int
  85. vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, int border)
  86. {
  87. /*NOTE:*/
  88. - int yplane_size = (height + 2 * border) * (width + 2 * border);
  89. - int uvplane_size = ((1 + height) / 2 + border) * ((1 + width) / 2 + border);
  90. -
  91. if (ybf)
  92. {
  93. + int y_stride = ((width + 2 * border) + 31) & ~31;
  94. + int yplane_size = (height + 2 * border) * y_stride;
  95. + /** There is currently a bunch of code which assumes
  96. + * uv_stride == y_stride/2, so enforce this here. */
  97. + int uv_width = width >> 1;
  98. + int uv_height = height >> 1;
  99. + int uv_stride = y_stride >> 1;
  100. + int uvplane_size = ((1 + height) / 2 + border) * uv_stride;
  101. +
  102. vp8_yv12_de_alloc_frame_buffer(ybf);
  103. + /** Only support allocating buffers that have a height and width that
  104. + * are multiples of 16, and a border that's a multiple of 32.
  105. + * The border restriction is required to get 16-byte alignment of the
  106. + * start of the chroma rows without intoducing an arbitrary gap
  107. + * between planes, which would break the semantics of things like
  108. + * vpx_img_set_rect(). */
  109. + if ((width & 0xf) | (height & 0xf) | (border & 0x1f))
  110. + return -3;
  111. +
  112. ybf->y_width = width;
  113. ybf->y_height = height;
  114. - ybf->y_stride = width + 2 * border;
  115. + ybf->y_stride = y_stride;
  116. - ybf->uv_width = (1 + width) / 2;
  117. - ybf->uv_height = (1 + height) / 2;
  118. - ybf->uv_stride = ybf->uv_width + border;
  119. + ybf->uv_width = uv_width;
  120. + ybf->uv_height = uv_height;
  121. + ybf->uv_stride = uv_stride;
  122. ybf->border = border;
  123. ybf->frame_size = yplane_size + 2 * uvplane_size;
  124. /* Added 2 extra lines to framebuffer so that copy12x12 doesn't fail
  125. * when we have a large motion vector in V on the last v block.
  126. * Note : We never use these pixels anyway so this doesn't hurt.
  127. */
  128. - ybf->buffer_alloc = (unsigned char *) duck_memalign(32, ybf->frame_size + (ybf->y_stride * 2) + 32, 0);
  129. + ybf->buffer_alloc = (unsigned char *) vpx_memalign(32, ybf->frame_size);
  130. if (ybf->buffer_alloc == NULL)
  131. return -1;
  132. - ybf->y_buffer = ybf->buffer_alloc + (border * ybf->y_stride) + border;
  133. -
  134. - if (yplane_size & 0xf)
  135. - yplane_size += 16 - (yplane_size & 0xf);
  136. -
  137. - ybf->u_buffer = ybf->buffer_alloc + yplane_size + (border / 2 * ybf->uv_stride) + border / 2;
  138. - ybf->v_buffer = ybf->buffer_alloc + yplane_size + uvplane_size + (border / 2 * ybf->uv_stride) + border / 2;
  139. + ybf->y_buffer = ybf->buffer_alloc + (border * y_stride) + border;
  140. + ybf->u_buffer = ybf->buffer_alloc + yplane_size + (border / 2 * uv_stride) + border / 2;
  141. + ybf->v_buffer = ybf->buffer_alloc + yplane_size + uvplane_size + (border / 2 * uv_stride) + border / 2;
  142. }
  143. else
  144. {
  145. return -2;
  146. }
  147. return 0;
  148. }