Mercurial > mplayer.hg

comparison libvo/vo_directx.c @ 33810:9d6f166e7070

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless () and {}.
author reimar
date Sun, 24 Jul 2011 18:21:15 +0000
parents ad332c21f549
children c1299d6cbc4e
comparison
equal deleted inserted replaced
33809:ad332c21f549 33810:9d6f166e7070
242 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR> invalid pixelformat: %s\n", g_ddpf[i].img_format_name); 242 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR> invalid pixelformat: %s\n", g_ddpf[i].img_format_name);
243 else 243 else
244 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>"); 244 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>");
245 switch (ddrval) { 245 switch (ddrval) {
246 case DDERR_INCOMPATIBLEPRIMARY: 246 case DDERR_INCOMPATIBLEPRIMARY:
247 { mp_msg(MSGT_VO, MSGL_ERR, "incompatible primary surface\n"); 247 mp_msg(MSGT_VO, MSGL_ERR, "incompatible primary surface\n");
248 break; 248 break;
249 }
250 case DDERR_INVALIDCAPS: 249 case DDERR_INVALIDCAPS:
251 { mp_msg(MSGT_VO, MSGL_ERR, "invalid caps\n"); 250 mp_msg(MSGT_VO, MSGL_ERR, "invalid caps\n");
252 break; 251 break;
253 }
254 case DDERR_INVALIDOBJECT: 252 case DDERR_INVALIDOBJECT:
255 { mp_msg(MSGT_VO, MSGL_ERR, "invalid object\n"); 253 mp_msg(MSGT_VO, MSGL_ERR, "invalid object\n");
256 break; 254 break;
257 }
258 case DDERR_INVALIDPARAMS: 255 case DDERR_INVALIDPARAMS:
259 { mp_msg(MSGT_VO, MSGL_ERR, "invalid parameters\n"); 256 mp_msg(MSGT_VO, MSGL_ERR, "invalid parameters\n");
260 break; 257 break;
261 }
262 case DDERR_NODIRECTDRAWHW: 258 case DDERR_NODIRECTDRAWHW:
263 { mp_msg(MSGT_VO, MSGL_ERR, "no directdraw hardware\n"); 259 mp_msg(MSGT_VO, MSGL_ERR, "no directdraw hardware\n");
264 break; 260 break;
265 }
266 case DDERR_NOEMULATION: 261 case DDERR_NOEMULATION:
267 { mp_msg(MSGT_VO, MSGL_ERR, "can't emulate\n"); 262 mp_msg(MSGT_VO, MSGL_ERR, "can't emulate\n");
268 break; 263 break;
269 }
270 case DDERR_NOFLIPHW: 264 case DDERR_NOFLIPHW:
271 { mp_msg(MSGT_VO, MSGL_ERR, "hardware can't do flip\n"); 265 mp_msg(MSGT_VO, MSGL_ERR, "hardware can't do flip\n");
272 break; 266 break;
273 }
274 case DDERR_NOOVERLAYHW: 267 case DDERR_NOOVERLAYHW:
275 { mp_msg(MSGT_VO, MSGL_ERR, "hardware can't do overlay\n"); 268 mp_msg(MSGT_VO, MSGL_ERR, "hardware can't do overlay\n");
276 break; 269 break;
277 }
278 case DDERR_OUTOFMEMORY: 270 case DDERR_OUTOFMEMORY:
279 { mp_msg(MSGT_VO, MSGL_ERR, "not enough system memory\n"); 271 mp_msg(MSGT_VO, MSGL_ERR, "not enough system memory\n");
280 break; 272 break;
281 }
282 case DDERR_UNSUPPORTEDMODE: 273 case DDERR_UNSUPPORTEDMODE:
283 { mp_msg(MSGT_VO, MSGL_ERR, "unsupported mode\n"); 274 mp_msg(MSGT_VO, MSGL_ERR, "unsupported mode\n");
284 break; 275 break;
285 }
286 case DDERR_OUTOFVIDEOMEMORY: 276 case DDERR_OUTOFVIDEOMEMORY:
287 { mp_msg(MSGT_VO, MSGL_ERR, "not enough video memory\n"); 277 mp_msg(MSGT_VO, MSGL_ERR, "not enough video memory\n");
288 break; 278 break;
289 }
290 default: 279 default:
291 mp_msg(MSGT_VO, MSGL_ERR, "create surface failed with 0x%x\n", ddrval); 280 mp_msg(MSGT_VO, MSGL_ERR, "create surface failed with 0x%x\n", ddrval);
292 } 281 }
293 return 1; 282 return 1;
294 } 283 }
530 if (rd.right > vo_screenwidth) 519 if (rd.right > vo_screenwidth)
531 rs.right = ((vo_screenwidth - rd.left) * 1000) / xstretch1000; 520 rs.right = ((vo_screenwidth - rd.left) * 1000) / xstretch1000;
532 if (rd.bottom > vo_screenheight) 521 if (rd.bottom > vo_screenheight)
533 rs.bottom = ((vo_screenheight - rd.top) * 1000) / ystretch1000; 522 rs.bottom = ((vo_screenheight - rd.top) * 1000) / ystretch1000;
534 /*do not allow to zoom or shrink if hardware isn't able to do so*/ 523 /*do not allow to zoom or shrink if hardware isn't able to do so*/
535 if ((width < image_width) && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKX)) { 524 if (width < image_width && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKX)) {
536 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKXN) 525 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKXN)
537 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only shrinkN\n"); 526 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only shrinkN\n");
538 else 527 else
539 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't shrink x\n"); 528 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't shrink x\n");
540 rd.right = rd.left + image_width; 529 rd.right = rd.left + image_width;
541 } else if ((width > image_width) && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHX)) { 530 } else if (width > image_width && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHX)) {
542 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHXN) 531 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHXN)
543 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only stretchN\n"); 532 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only stretchN\n");
544 else 533 else
545 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't stretch x\n"); 534 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't stretch x\n");
546 rd.right = rd.left + image_width; 535 rd.right = rd.left + image_width;
547 } 536 }
548 if ((height < image_height) && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKY)) { 537 if (height < image_height && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKY)) {
549 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKYN) 538 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKYN)
550 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only shrinkN\n"); 539 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only shrinkN\n");
551 else 540 else
552 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't shrink y\n"); 541 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't shrink y\n");
553 rd.bottom = rd.top + image_height; 542 rd.bottom = rd.top + image_height;
554 } else if ((height > image_height) && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHY)) { 543 } else if (height > image_height && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHY)) {
555 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHYN) 544 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHYN)
556 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only stretchN\n"); 545 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only stretchN\n");
557 else 546 else
558 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't stretch y\n"); 547 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't stretch y\n");
559 rd.bottom = rd.top + image_height; 548 rd.bottom = rd.top + image_height;
613 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>UpdateOverlay failed\n"); 602 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>UpdateOverlay failed\n");
614 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>Overlay:x1:%i,y1:%i,x2:%i,y2:%i,w:%i,h:%i\n", rd.left, rd.top, rd.right, rd.bottom, rd.right - rd.left, rd.bottom - rd.top); 603 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>Overlay:x1:%i,y1:%i,x2:%i,y2:%i,w:%i,h:%i\n", rd.left, rd.top, rd.right, rd.bottom, rd.right - rd.left, rd.bottom - rd.top);
615 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>"); 604 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>");
616 switch (ddrval) { 605 switch (ddrval) {
617 case DDERR_NOSTRETCHHW: 606 case DDERR_NOSTRETCHHW:
618 { mp_msg(MSGT_VO, MSGL_ERR, "hardware can't stretch: try to size the window back\n"); 607 mp_msg(MSGT_VO, MSGL_ERR, "hardware can't stretch: try to size the window back\n");
619 break; 608 break;
620 }
621 case DDERR_INVALIDRECT: 609 case DDERR_INVALIDRECT:
622 { mp_msg(MSGT_VO, MSGL_ERR, "invalid rectangle\n"); 610 mp_msg(MSGT_VO, MSGL_ERR, "invalid rectangle\n");
623 break; 611 break;
624 }
625 case DDERR_INVALIDPARAMS: 612 case DDERR_INVALIDPARAMS:
626 { mp_msg(MSGT_VO, MSGL_ERR, "invalid parameters\n"); 613 mp_msg(MSGT_VO, MSGL_ERR, "invalid parameters\n");
627 break; 614 break;
628 }
629 case DDERR_HEIGHTALIGN: 615 case DDERR_HEIGHTALIGN:
630 { mp_msg(MSGT_VO, MSGL_ERR, "height align\n"); 616 mp_msg(MSGT_VO, MSGL_ERR, "height align\n");
631 break; 617 break;
632 }
633 case DDERR_XALIGN: 618 case DDERR_XALIGN:
634 { mp_msg(MSGT_VO, MSGL_ERR, "x align\n"); 619 mp_msg(MSGT_VO, MSGL_ERR, "x align\n");
635 break; 620 break;
636 }
637 case DDERR_UNSUPPORTED: 621 case DDERR_UNSUPPORTED:
638 { mp_msg(MSGT_VO, MSGL_ERR, "unsupported\n"); 622 mp_msg(MSGT_VO, MSGL_ERR, "unsupported\n");
639 break; 623 break;
640 }
641 case DDERR_INVALIDSURFACETYPE: 624 case DDERR_INVALIDSURFACETYPE:
642 { mp_msg(MSGT_VO, MSGL_ERR, "invalid surfacetype\n"); 625 mp_msg(MSGT_VO, MSGL_ERR, "invalid surfacetype\n");
643 break; 626 break;
644 }
645 case DDERR_INVALIDOBJECT: 627 case DDERR_INVALIDOBJECT:
646 { mp_msg(MSGT_VO, MSGL_ERR, "invalid object\n"); 628 mp_msg(MSGT_VO, MSGL_ERR, "invalid object\n");
647 break; 629 break;
648 }
649 case DDERR_SURFACELOST: 630 case DDERR_SURFACELOST:
650 {
651 mp_msg(MSGT_VO, MSGL_ERR, "surfaces lost\n"); 631 mp_msg(MSGT_VO, MSGL_ERR, "surfaces lost\n");
652 g_lpddsOverlay->lpVtbl->Restore(g_lpddsOverlay); //restore and try again 632 g_lpddsOverlay->lpVtbl->Restore(g_lpddsOverlay); //restore and try again
653 g_lpddsPrimary->lpVtbl->Restore(g_lpddsPrimary); 633 g_lpddsPrimary->lpVtbl->Restore(g_lpddsPrimary);
654 ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, &rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx); 634 ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, &rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx);
655 if (ddrval != DD_OK) 635 if (ddrval != DD_OK)
656 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>UpdateOverlay failed again\n"); 636 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>UpdateOverlay failed again\n");
657 break; 637 break;
658 }
659 default: 638 default:
660 mp_msg(MSGT_VO, MSGL_ERR, " 0x%x\n", ddrval); 639 mp_msg(MSGT_VO, MSGL_ERR, " 0x%x\n", ddrval);
661 } 640 }
662 /*ok we can't do anything about it -> hide overlay*/ 641 /*ok we can't do anything about it -> hide overlay*/
663 if (ddrval != DD_OK) { 642 if (ddrval != DD_OK) {
930 } 909 }
931 if (mpi->type == MP_IMGTYPE_STATIC) { 910 if (mpi->type == MP_IMGTYPE_STATIC) {
932 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>not static\n"); 911 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>not static\n");
933 return VO_FALSE; 912 return VO_FALSE;
934 } 913 }
935 if ((mpi->width == dstride) || (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) { 914 if (mpi->width == dstride || (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) {
936 if (mpi->flags & MP_IMGFLAG_PLANAR) { 915 if (mpi->flags & MP_IMGFLAG_PLANAR) {
937 if (image_format == IMGFMT_YV12) { 916 if (image_format == IMGFMT_YV12) {
938 mpi->planes[2] = image + dstride * image_height; 917 mpi->planes[2] = image + dstride * image_height;
939 mpi->planes[1] = image + dstride * image_height + dstride * image_height / 4; 918 mpi->planes[1] = image + dstride * image_height + dstride * image_height / 4;
940 mpi->stride[1] = mpi->stride[2] = dstride / 2; 919 mpi->stride[1] = mpi->stride[2] = dstride / 2;
1178 { 1157 {
1179 switch (request) { 1158 switch (request) {
1180 case VOCTRL_GET_IMAGE: 1159 case VOCTRL_GET_IMAGE:
1181 return get_image(data); 1160 return get_image(data);
1182 case VOCTRL_QUERY_FORMAT: 1161 case VOCTRL_QUERY_FORMAT:
1183 return query_format(*((uint32_t *)data)); 1162 return query_format(*(uint32_t *)data);
1184 case VOCTRL_DRAW_IMAGE: 1163 case VOCTRL_DRAW_IMAGE:
1185 return put_image(data); 1164 return put_image(data);
1186 case VOCTRL_BORDER: 1165 case VOCTRL_BORDER:
1187 vo_w32_border(); 1166 vo_w32_border();
1188 Directx_ManageDisplay(); 1167 Directx_ManageDisplay();
1202 vo_rootwin = 1; 1181 vo_rootwin = 1;
1203 Directx_ManageDisplay(); 1182 Directx_ManageDisplay();
1204 } 1183 }
1205 return VO_TRUE; 1184 return VO_TRUE;
1206 case VOCTRL_FULLSCREEN: 1185 case VOCTRL_FULLSCREEN:
1207 {
1208 vo_w32_fullscreen(); 1186 vo_w32_fullscreen();
1209 Directx_ManageDisplay(); 1187 Directx_ManageDisplay();
1210 return VO_TRUE; 1188 return VO_TRUE;
1211 }
1212 case VOCTRL_SET_EQUALIZER: { 1189 case VOCTRL_SET_EQUALIZER: {
1213 vf_equalizer_t *eq = data; 1190 vf_equalizer_t *eq = data;
1214 return color_ctrl_set(eq->item, eq->value); 1191 return color_ctrl_set(eq->item, eq->value);
1215 } 1192 }
1216 case VOCTRL_GET_EQUALIZER: { 1193 case VOCTRL_GET_EQUALIZER: {