Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* an overlay_view::{h|v}_start different from 0 is now supported

Browse Source 
* The overlay_view is now also correctly clipped when you move the overlay
  window offscreen to the left or to the right.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17402 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-05-09 19:34:58 +00:00
parent 72119ffac8
commit c415480607
2 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/add-ons/accelerants/intel_extreme/accelerant.h
View File

@ -45,6 +45,7 @@ struct accelerant_info {
overlay_frame last_overlay_frame;
uint32 last_horizontal_overlay_scale;
uint32 last_vertical_overlay_scale;
uint32 overlay_position_buffer_offset;
int device;
bool is_clone;

62
src/add-ons/accelerants/intel_extreme/overlay.cpp
View File

@ -512,6 +512,23 @@ intel_configure_overlay(overlay_token overlayToken, const overlay_buffer *buffer
struct overlay *overlay = (struct overlay *)buffer;
overlay_registers *registers = gInfo->overlay_registers;
bool updateCoefficients = false;
uint32 bytesPerPixel = 2;
switch (buffer->space) {
case B_RGB15:
registers->source_format = OVERLAY_FORMAT_RGB15;
break;
case B_RGB16:
registers->source_format = OVERLAY_FORMAT_RGB16;
break;
case B_RGB32:
registers->source_format = OVERLAY_FORMAT_RGB32;
bytesPerPixel = 4;
break;
case B_YCbCr422:
registers->source_format = OVERLAY_FORMAT_YCbCr422;
break;
}
if (!gInfo->shared_info->overlay_active
|| memcmp(&gInfo->last_overlay_view, view, sizeof(overlay_view))
@ -540,15 +557,6 @@ intel_configure_overlay(overlay_token overlayToken, const overlay_buffer *buffer
registers->window_width = right - left;
registers->window_height = bottom - top;
// Note: in non-planar mode, you *must* not program the source width/height
// UV registers - they must stay cleared, or the chip is doing strange stuff.
// On the other hand, you have to program the UV scaling registers, or the
// result will be wrong, too.
registers->source_width_rgb = view->width;
registers->source_height_rgb = view->height;
registers->source_bytes_per_row_rgb = (((overlay->buffer_offset + (view->width << 1)
+ 0x1f) >> 5) - (overlay->buffer_offset >> 5) - 1) << 2;
uint32 horizontalScale = ((view->width - 1) << 12) / window->width;
uint32 verticalScale = ((view->height - 1) << 12) / window->height;
uint32 horizontalScaleUV = horizontalScale >> 1;
@ -556,6 +564,25 @@ intel_configure_overlay(overlay_token overlayToken, const overlay_buffer *buffer
horizontalScale = horizontalScaleUV << 1;
verticalScale = verticalScaleUV << 1;
// we need to offset the overlay view to adapt it to the clipping
// (in addition to whatever offset is desired already)
left = view->h_start - (int32)((window->h_start - left) * (horizontalScale / 4096.0) + 0.5);
top = view->v_start - (int32)((window->v_start - top) * (verticalScale / 4096.0) + 0.5);
right = view->h_start + view->width;
bottom = view->v_start + view->height;
gInfo->overlay_position_buffer_offset = buffer->bytes_per_row * top
+ left * bytesPerPixel;
// Note: in non-planar mode, you *must* not program the source width/height
// UV registers - they must stay cleared, or the chip is doing strange stuff.
// On the other hand, you have to program the UV scaling registers, or the
// result will be wrong, too.
registers->source_width_rgb = right - left;
registers->source_height_rgb = bottom - top;
registers->source_bytes_per_row_rgb = (((overlay->buffer_offset + (view->width << 1)
+ 0x1f) >> 5) - (overlay->buffer_offset >> 5) - 1) << 2;
// horizontal scaling
registers->scale_rgb.horizontal_downscale_factor = horizontalScale >> 12;
registers->scale_rgb.horizontal_scale_fraction = horizontalScale & 0xfff;
@ -617,24 +644,9 @@ intel_configure_overlay(overlay_token overlayToken, const overlay_buffer *buffer
// program buffer
registers->buffer_rgb0 = overlay->buffer_offset;
registers->buffer_rgb0 = overlay->buffer_offset + gInfo->overlay_position_buffer_offset;
registers->stride_rgb = buffer->bytes_per_row;
switch (buffer->space) {
case B_RGB15:
registers->source_format = OVERLAY_FORMAT_RGB15;
break;
case B_RGB16:
registers->source_format = OVERLAY_FORMAT_RGB16;
break;
case B_RGB32:
registers->source_format = OVERLAY_FORMAT_RGB32;
break;
case B_YCbCr422:
registers->source_format = OVERLAY_FORMAT_YCbCr422;
break;
}
registers->mirroring_mode = (window->flags & B_OVERLAY_HORIZONTAL_MIRRORING) != 0
? OVERLAY_MIRROR_HORIZONTAL : OVERLAY_MIRROR_NORMAL;
registers->ycbcr422_order = 0;