diff options
Diffstat (limited to 'libvo/vo_dxr3.c')
-rw-r--r-- | libvo/vo_dxr3.c | 120 |
1 files changed, 61 insertions, 59 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index b91c38c9d1..9504690511 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -130,6 +130,8 @@ #include <math.h> #include "config.h" +#include "mp_msg.h" +#include "help_mp.h" #ifdef HAVE_MALLOC_H #include <malloc.h> #endif @@ -281,7 +283,7 @@ static int control(uint32_t request, void *data, ...) return VO_TRUE; case VOCTRL_SET_SPU_PALETTE: if (ioctl(fd_spu, EM8300_IOCTL_SPU_SETPALETTE, data) < 0) { - printf("VO: [dxr3] Unable to load new SPU palette!\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette); return VO_ERROR; } return VO_TRUE; @@ -311,7 +313,7 @@ static int control(uint32_t request, void *data, ...) if (dxr3_prebuf) { ioval = EM8300_PLAYMODE_PLAY; if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) { - printf("VO: [dxr3] Unable to set playmode!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetPlaymode); } } return VO_TRUE; @@ -319,7 +321,7 @@ static int control(uint32_t request, void *data, ...) if (dxr3_prebuf) { ioval = EM8300_PLAYMODE_PAUSED; if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) { - printf("VO: [dxr3] Unable to set playmode!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetPlaymode); } } return VO_TRUE; @@ -425,7 +427,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ /* up in a lockup */ ioval = EM8300_SPUMODE_ON; if (ioctl(fd_control, EM8300_IOCTL_SET_SPUMODE, &ioval) < 0) { - printf("VO: [dxr3] Unable to set subpicture mode!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetSubpictureMode); uninit(); return -1; } @@ -433,7 +435,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ /* Set the playmode to play (just in case another app has set it to something else) */ ioval = EM8300_PLAYMODE_PLAY; if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) { - printf("VO: [dxr3] Unable to set playmode!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetPlaymode); } /* Start em8300 prebuffering and sync engine */ @@ -465,7 +467,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ monitor_aspect = (float) width / (float) height; if (ioctl(fd_control, EM8300_IOCTL_GET_VIDEOMODE, &old_vmode) < 0) { - printf("VO: [dxr3] Unable to get TV norm!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToGetTVNorm); old_vmode = -1; } @@ -484,8 +486,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ ioval = EM8300_VIDEOMODE_PAL; } - printf("VO: [dxr3] Auto-selected TV norm by frame rate: "); - ioval == EM8300_VIDEOMODE_PAL60 ? printf("PAL-60") : printf("PAL"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoSelectedTVNormByFrameRate); + ioval == EM8300_VIDEOMODE_PAL60 ? mp_msg(MSGT_VO,MSGL_INFO, "PAL-60") : mp_msg(MSGT_VO,MSGL_INFO, "PAL"); printf(".\n"); } else { if (vo_fps > 28) { @@ -494,14 +496,14 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ ioval = EM8300_VIDEOMODE_PAL; } - printf("VO: [dxr3] Auto-selected TV norm by frame rate: "); - ioval == EM8300_VIDEOMODE_NTSC ? printf("NTSC") : printf("PAL"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoSelectedTVNormByFrameRate); + ioval == EM8300_VIDEOMODE_NTSC ? mp_msg(MSGT_VO,MSGL_INFO, "NTSC") : mp_msg(MSGT_VO,MSGL_INFO, "PAL"); printf(".\n"); } if (old_vmode != ioval) { if (ioctl(fd_control, EM8300_IOCTL_SET_VIDEOMODE, &ioval) < 0) { - printf("VO: [dxr3] Unable to set TV norm!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetTVNorm); } } } @@ -512,10 +514,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ aspect_save_prescale(d_width, d_height); ioctl(fd_control, EM8300_IOCTL_GET_VIDEOMODE, &ioval); if (ioval == EM8300_VIDEOMODE_NTSC) { - printf("VO: [dxr3] Setting up for NTSC.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingUpForNTSC); aspect_save_screenres(352, 240); } else { - printf("VO: [dxr3] Setting up for PAL/SECAM.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingUpForPALSECAM); aspect_save_screenres(352, 288); } aspect(&s_width, &s_height, A_ZOOM); @@ -528,10 +530,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ tmp2 = abs(d_height - (int) (d_width / 2.35)); if (tmp1 < tmp2) { ioval = EM8300_ASPECTRATIO_4_3; - printf("VO: [dxr3] Setting aspect ratio to 4:3.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingAspectRatioTo43); } else { ioval = EM8300_ASPECTRATIO_16_9; - printf("VO: [dxr3] Setting aspect ratio to 16:9.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingAspectRatioTo169); } ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval); @@ -550,20 +552,20 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ osdpicbuf = calloc( 1,s_width * s_height); if (osdpicbuf == NULL) { - printf("VO: [dxr3] Out of memory.\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_OutOfMemory); return -1; } spued = (encodedata *) malloc(sizeof(encodedata)); if (spued == NULL) { free( osdpicbuf ); - printf("VO: [dxr3] Out of memory.\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_OutOfMemory); return -1; } spubuf = (encodedata *) malloc(sizeof(encodedata)); if (spubuf == NULL) { free( osdpicbuf ); free( spued ); - printf("VO: [dxr3] Out of memory.\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_OutOfMemory); return -1; } osd_w = s_width; @@ -651,13 +653,13 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ ((key_color.blue >> (16 - blue_prec)) << blue_shift)); key_color.flags = DoRed | DoGreen | DoBlue; if (!XAllocColor(mDisplay, cmap, &key_color)) { - printf("VO: [dxr3] Unable to allocate keycolor!\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToAllocateKeycolor); return -1; } acq_color = ((key_color.red / 256) << 16) | ((key_color.green / 256) << 8) | key_color.blue; if (key_color.pixel != KEY_COLOR) { - printf("VO: [dxr3] Unable to allocate exact keycolor, using closest match (0x%lx).\n", key_color.pixel); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToAllocateExactKeycolor, key_color.pixel); } /* Set keycolor and activate overlay */ @@ -814,7 +816,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int static void uninit(void) { - printf("VO: [dxr3] Uninitializing.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Uninitializing); #ifdef HAVE_X11 if (dxr3_overlay) { overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF); @@ -832,7 +834,7 @@ static void uninit(void) #endif if (old_vmode != -1) { if (ioctl(fd_control, EM8300_IOCTL_SET_VIDEOMODE, &old_vmode) < 0) { - printf("VO: [dxr3] Failed restoring TV norm!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedRestoringTVNorm); } } @@ -867,49 +869,49 @@ static int preinit(const char *arg) /* Parse commandline */ while (arg) { if (!strncmp("prebuf", arg, 6) && !dxr3_prebuf) { - printf("VO: [dxr3] Enabling prebuffering.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_EnablingPrebuffering); dxr3_prebuf = 1; } else if (!strncmp("sync", arg, 4) && !dxr3_newsync) { - printf("VO: [dxr3] Using new sync engine.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingNewSyncEngine); dxr3_newsync = 1; } else if (!strncmp("overlay", arg, 7) && !dxr3_overlay) { #ifdef HAVE_X11 - printf("VO: [dxr3] Using overlay.\n"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingOverlay); dxr3_overlay = 1; #else - printf("VO: [dxr3] Error: You need to compile mplayer with x11 libraries and headers installed to use overlay.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorYouNeedToCompileMplayerWithX11); #endif } else if (!strncmp("norm=", arg, 5)) { arg += 5; // dxr3_norm is 0 (-> don't change norm) by default // but maybe someone changes this in the future - printf("VO: [dxr3] Will set TV norm to: "); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_WillSetTVNormTo); if (*arg == '5') { dxr3_norm = 5; - printf("NTSC"); + mp_msg(MSGT_VO,MSGL_INFO, "NTSC"); } else if (*arg == '4') { dxr3_norm = 4; - printf("PAL-60"); + mp_msg(MSGT_VO,MSGL_INFO, "PAL-60"); } else if (*arg == '3') { dxr3_norm = 3; - printf("PAL"); + mp_msg(MSGT_VO,MSGL_INFO, "PAL"); } else if (*arg == '2') { dxr3_norm = 2; - printf("Auto-adjust to movie frame rate (PAL/PAL-60)"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoAdjustToMovieFrameRatePALPAL60); } else if (*arg == '1') { dxr3_norm = 1; - printf("Auto-adjust to movie frame rate (PAL/NTSC)"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoAdjustToMovieFrameRatePALNTSC); } else if (*arg == '0') { dxr3_norm = 0; - printf("Use current norm"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UseCurrentNorm); } else { dxr3_norm = 0; - printf("Unknown norm supplied. Use current norm"); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UseUnknownNormSuppliedCurrentNorm); } - printf(".\n"); + mp_msg(MSGT_VO,MSGL_INFO, ".\n"); } else if (arg[0] == '0' || arg[0] == '1' || arg[0] == '2' || arg[0] == '3') { dxr3_device_num = arg[0]; } @@ -926,15 +928,15 @@ static int preinit(const char *arg) fd_control = open(devname, fdflags); if (fd_control < 1) { /* Fall back to old naming scheme */ - printf("VO: [dxr3] Error opening %s for writing, trying /dev/em8300 instead.\n", devname); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingTrying, devname); sprintf(devname, "/dev/em8300"); fd_control = open(devname, fdflags); if (fd_control < 1) { - printf("VO: [dxr3] Error opening /dev/em8300 for writing as well!\nBailing.\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingAsWell); return -1; } } else { - printf("VO: [dxr3] Opened %s.\n", devname); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Opened, devname); } /* Open the video interface */ @@ -942,16 +944,16 @@ static int preinit(const char *arg) fd_video = open(devname, fdflags); if (fd_video < 0) { /* Fall back to old naming scheme */ - printf("VO: [dxr3] Error opening %s for writing, trying /dev/em8300_mv instead.\n", devname); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingTryingMV, devname); sprintf(devname, "/dev/em8300_mv"); fd_video = open(devname, fdflags); if (fd_video < 0) { - printf("VO: [dxr3] Error opening /dev/em8300_mv for writing as well!\nBailing.\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingAsWellMV); uninit(); return -1; } } else { - printf("VO: [dxr3] Opened %s.\n", devname); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Opened, devname); } strcpy(fdv_name, devname); @@ -960,16 +962,16 @@ static int preinit(const char *arg) fd_spu = open(devname, fdflags); if (fd_spu < 0) { /* Fall back to old naming scheme */ - printf("VO: [dxr3] Error opening %s for writing, trying /dev/em8300_sp instead.\n", devname); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingTryingSP, devname); sprintf(devname, "/dev/em8300_sp"); fd_spu = open(devname, fdflags); if (fd_spu < 0) { - printf("VO: [dxr3] Error opening /dev/em8300_sp for writing as well!\nBailing.\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingAsWellSP); uninit(); return -1; } } else { - printf("VO: [dxr3] Opened %s.\n", devname); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Opened, devname); } strcpy(fds_name, devname); @@ -986,7 +988,7 @@ static int preinit(const char *arg) dpy = XOpenDisplay(NULL); if (!dpy) { - printf("VO: [dxr3] Unable to open display during overlay hack setup!\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToOpenDisplayDuringHackSetup); return -1; } XGetWindowAttributes(dpy, RootWindow(dpy, DefaultScreen(dpy)), &attribs); @@ -1006,7 +1008,7 @@ static int preinit(const char *arg) if (!use_gui) { #endif if (!vo_init()) { - printf("VO: [dxr3] Unable to init x11!\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11); return -1; } #ifdef HAVE_NEW_GUI @@ -1045,7 +1047,7 @@ static int overlay_set_attribute(overlay_t *o, int attribute, int value) attr.value = value; if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SET_ATTRIBUTE, &attr)==-1) { - printf("VO: [dxr3] Failed setting overlay attribute.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSettingOverlayAttribute); return -1; } @@ -1251,7 +1253,7 @@ static int overlay_set_screen(overlay_t *o, int xres, int yres, int depth) if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETSCREEN, &scr)==-1) { - printf("VO: [dxr3] Failed setting overlay screen!\nExiting.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSettingOverlayScreen); return -1; } return 0; @@ -1260,7 +1262,7 @@ static int overlay_set_screen(overlay_t *o, int xres, int yres, int depth) static int overlay_set_mode(overlay_t *o, int mode) { if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETMODE, &mode)==-1) { - printf("VO: [dxr3] Failed enabling overlay!\nExiting.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedEnablingOverlay); return -1; } return 0; @@ -1276,7 +1278,7 @@ static int overlay_set_window(overlay_t *o, int xpos,int ypos,int width,int heig if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETWINDOW, &win)==-1) { - printf("VO: [dxr3] Failed resizing overlay window!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedResizingOverlayWindow); return -1; } return 0; @@ -1291,7 +1293,7 @@ static int overlay_set_bcs(overlay_t *o, int brightness, int contrast, int satur if (ioctl(o->dev, EM8300_IOCTL_GETBCS, &bcs)==-1) { - printf("VO: [dxr3] Failed setting overlay bcs!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSettingOverlayBcs); return -1; } return 0; @@ -1379,11 +1381,11 @@ static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg) cal.cal_mode = EM8300_OVERLAY_CALMODE_YOFFSET; if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal)) { - printf("VO: [dxr3] Failed getting overlay Y-offset values!\nExiting.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedGettingOverlayYOffsetValues); return -1; } o->yoffset = cal.result; - printf("Yoffset: %d\n",cal.result); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_YOffset,cal.result); /* Calibrate X-offset */ @@ -1392,11 +1394,11 @@ static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg) cal.cal_mode = EM8300_OVERLAY_CALMODE_XOFFSET; if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal)) { - printf("VO: [dxr3] Failed getting overlay X-offset values!\nExiting.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedGettingOverlayXOffsetValues); return -1; } o->xoffset = cal.result; - printf("Xoffset: %d\n",cal.result); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_XOffset,cal.result); /* Calibrate X scale correction */ @@ -1405,10 +1407,10 @@ static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg) cal.cal_mode = EM8300_OVERLAY_CALMODE_XCORRECTION; if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal)) { - printf("VO: [dxr3] Failed getting overlay X-scale correction!\nExiting.\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedGettingOverlayYScaleCorrection); return -1; } - printf("Xcorrection: %d\n",cal.result); + mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_XCorrection,cal.result); o->xcorr = cal.result; win.xpos = 10; @@ -1416,7 +1418,7 @@ static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg) win.width = o->xres-20; win.height = o->yres-20; if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETWINDOW, &win)==-1) { - printf("VO: [dxr3] Failed resizing overlay window!\n"); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_FailedResizingOverlayWindow); exit(1); } @@ -1479,7 +1481,7 @@ static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg) static int overlay_signalmode(overlay_t *o, int mode) { if(ioctl(o->dev, EM8300_IOCTL_OVERLAY_SIGNALMODE, &mode) ==-1) { - printf("VO: [dxr3] Failed set signal mix!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSetSignalMix); return -1; } return 0; |