Skip to content

V
vlc-2-2
Commit 1772a146 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed rendering of subpictures with non 0 offset in direct3d. 

It is needed for DVD menu support.
parent 446263ea
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/video_output/msw/direct3d.c
View file @ 1772a146
...@@ -1254,10 +1254,12 @@ static void Direct3DImportSubpicture(vout_display_t *vd, ...@@ -1254,10 +1254,12 @@ static void Direct3DImportSubpicture(vout_display_t *vd,
D3DLOCKED_RECT lock; D3DLOCKED_RECT lock;
hr = IDirect3DTexture9_LockRect(d3dr->texture, 0, &lock, NULL, 0); hr = IDirect3DTexture9_LockRect(d3dr->texture, 0, &lock, NULL, 0);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
uint8_t *dst_data = lock.pBits; uint8_t *dst_data = lock.pBits;
int dst_pitch = lock.Pitch; int dst_pitch = lock.Pitch;
uint8_t *src_data = r->p_picture->p->p_pixels; const int src_offset = r->fmt.i_y_offset * r->p_picture->p->i_pitch +
int src_pitch = r->p_picture->p->i_pitch; r->fmt.i_x_offset * r->p_picture->p->i_pixel_pitch;
uint8_t *src_data = &r->p_picture->p->p_pixels[src_offset];
int src_pitch = r->p_picture->p->i_pitch;
for (unsigned y = 0; y < r->fmt.i_visible_height; y++) { for (unsigned y = 0; y < r->fmt.i_visible_height; y++) {
int copy_pitch = __MIN(dst_pitch, r->p_picture->p->i_visible_pitch); int copy_pitch = __MIN(dst_pitch, r->p_picture->p->i_visible_pitch);
if (d3dr->format == D3DFMT_A8B8G8R8) { if (d3dr->format == D3DFMT_A8B8G8R8) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment