diff options
-rw-r--r-- | audio/out/ao_dsound.c | 72 | ||||
-rw-r--r-- | audio/out/ao_oss.c | 90 | ||||
-rw-r--r-- | mpvcore/mp_msg.h | 2 | ||||
-rw-r--r-- | video/out/vo_caca.c | 12 | ||||
-rw-r--r-- | video/out/vo_direct3d.c | 139 | ||||
-rw-r--r-- | video/out/vo_image.c | 12 | ||||
-rw-r--r-- | video/out/vo_sdl.c | 36 | ||||
-rw-r--r-- | video/out/vo_vdpau.c | 96 | ||||
-rw-r--r-- | video/out/vo_xv.c | 98 |
9 files changed, 241 insertions, 316 deletions
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 039df2a7ed..3002b67dcc 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -152,25 +152,10 @@ static void UninitDirectSound(struct ao *ao) FreeLibrary(p->hdsound_dll); p->hdsound_dll = NULL; } - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: DirectSound uninitialized\n"); + MP_VERBOSE(ao, "DirectSound uninitialized\n"); } /** -\brief print the commandline help -*/ -static void print_help(void) -{ - mp_msg(MSGT_AO, MSGL_FATAL, - "\n-ao dsound commandline help:\n" - "Example: mpv -ao dsound:device=1\n" - " sets 1st device\n" - "\nOptions:\n" - " device=<device-number>\n" - " Sets device number, use -v to get a list\n"); -} - - -/** \brief enumerate direct sound devices \return TRUE to continue with the enumeration */ @@ -180,13 +165,13 @@ static BOOL CALLBACK DirectSoundEnum(LPGUID guid, LPCSTR desc, LPCSTR module, struct ao *ao = context; struct priv *p = ao->priv; - mp_msg(MSGT_AO, MSGL_V, "%i %s ", p->device_index, desc); + MP_VERBOSE(ao, "%i %s ", p->device_index, desc); if (p->device_num == p->device_index) { - mp_msg(MSGT_AO, MSGL_V, "<--"); + MP_VERBOSE(ao, "<--"); if (guid) memcpy(&p->device, guid, sizeof(GUID)); } - mp_msg(MSGT_AO, MSGL_V, "\n"); + MP_VERBOSE(ao, "\n"); p->device_index++; return TRUE; } @@ -210,7 +195,7 @@ static int InitDirectSound(struct ao *ao) p->hdsound_dll = LoadLibrary("DSOUND.DLL"); if (p->hdsound_dll == NULL) { - mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: cannot load DSOUND.DLL\n"); + MP_ERR(ao, "cannot load DSOUND.DLL\n"); return 0; } OurDirectSoundCreate = (void *)GetProcAddress(p->hdsound_dll, @@ -219,21 +204,20 @@ static int InitDirectSound(struct ao *ao) "DirectSoundEnumerateA"); if (OurDirectSoundCreate == NULL || OurDirectSoundEnumerate == NULL) { - mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: GetProcAddress FAILED\n"); + MP_ERR(ao, "GetProcAddress FAILED\n"); FreeLibrary(p->hdsound_dll); return 0; } // Enumerate all directsound p->devices - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: Output Devices:\n"); + MP_VERBOSE(ao, "Output Devices:\n"); OurDirectSoundEnumerate(DirectSoundEnum, ao); // Create the direct sound object if (FAILED(OurDirectSoundCreate((p->device_num) ? &p->device : NULL, &p->hds, NULL))) { - mp_msg(MSGT_AO, MSGL_ERR, - "ao_dsound: cannot create a DirectSound device\n"); + MP_ERR(ao, "cannot create a DirectSound device\n"); FreeLibrary(p->hdsound_dll); return 0; } @@ -251,22 +235,20 @@ static int InitDirectSound(struct ao *ao) if (IDirectSound_SetCooperativeLevel(p->hds, GetDesktopWindow(), DSSCL_EXCLUSIVE)) { - mp_msg(MSGT_AO, MSGL_ERR, - "ao_dsound: cannot set direct sound cooperative level\n"); + MP_ERR(ao, "cannot set direct sound cooperative level\n"); IDirectSound_Release(p->hds); FreeLibrary(p->hdsound_dll); return 0; } - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: DirectSound initialized\n"); + MP_VERBOSE(ao, "DirectSound initialized\n"); memset(&dscaps, 0, sizeof(DSCAPS)); dscaps.dwSize = sizeof(DSCAPS); if (DS_OK == IDirectSound_GetCaps(p->hds, &dscaps)) { if (dscaps.dwFlags & DSCAPS_EMULDRIVER) - mp_msg(MSGT_AO, MSGL_V, - "ao_dsound: DirectSound is emulated, waveOut may give better performance\n"); + MP_VERBOSE(ao, "DirectSound is emulated\n"); } else { - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: cannot get device capabilities\n"); + MP_VERBOSE(ao, "cannot get device capabilities\n"); } return 1; @@ -424,9 +406,8 @@ static int init(struct ao *ao) case AF_FORMAT_U8: break; default: - mp_msg(MSGT_AO, MSGL_V, - "ao_dsound: format %s not supported defaulting to Signed 16-bit Little-Endian\n", - af_fmt2str_short(format)); + MP_VERBOSE(ao, "format %s not supported defaulting to Signed 16-bit Little-Endian\n", + af_fmt2str_short(format)); format = AF_FORMAT_S16_LE; } //set our audio parameters @@ -434,11 +415,10 @@ static int init(struct ao *ao) ao->format = format; ao->bps = ao->channels.num * rate * (af_fmt2bits(format) >> 3); int buffersize = ao->bps; // space for 1 sec - mp_msg(MSGT_AO, MSGL_V, - "ao_dsound: Samplerate:%iHz Channels:%i Format:%s\n", rate, - ao->channels.num, af_fmt2str_short(format)); - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: Buffersize:%d bytes (%d msec)\n", - buffersize, buffersize / ao->bps * 1000); + MP_VERBOSE(ao, "Samplerate:%iHz Channels:%i Format:%s\n", rate, + ao->channels.num, af_fmt2str_short(format)); + MP_VERBOSE(ao, "Buffersize:%d bytes (%d msec)\n", + buffersize, buffersize / ao->bps * 1000); //fill waveformatex ZeroMemory(&wformat, sizeof(WAVEFORMATEXTENSIBLE)); @@ -494,19 +474,16 @@ static int init(struct ao *ao) res = IDirectSound_CreateSoundBuffer(p->hds, &dsbpridesc, &p->hdspribuf, NULL); if (res != DS_OK) { UninitDirectSound(ao); - mp_msg(MSGT_AO, MSGL_ERR, - "ao_dsound: cannot create primary buffer (%s)\n", - dserr2str(res)); + MP_ERR(ao, "cannot create primary buffer (%s)\n", dserr2str(res)); return -1; } res = IDirectSoundBuffer_SetFormat(p->hdspribuf, (WAVEFORMATEX *)&wformat); if (res != DS_OK) { - mp_msg(MSGT_AO, MSGL_WARN, - "ao_dsound: cannot set primary buffer format (%s), using " - "standard setting (bad quality)", dserr2str(res)); + MP_WARN(ao, "cannot set primary buffer format (%s), using " + "standard setting (bad quality)", dserr2str(res)); } - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: primary buffer created\n"); + MP_VERBOSE(ao, "primary buffer created\n"); // now create the stream buffer @@ -519,13 +496,12 @@ static int init(struct ao *ao) } if (res != DS_OK) { UninitDirectSound(ao); - mp_msg(MSGT_AO, MSGL_ERR, - "ao_dsound: cannot create secondary (stream)buffer (%s)\n", + MP_ERR(ao, "cannot create secondary (stream)buffer (%s)\n", dserr2str(res)); return -1; } } - mp_msg(MSGT_AO, MSGL_V, "ao_dsound: secondary (stream)buffer created\n"); + MP_VERBOSE(ao, "secondary (stream)buffer created\n"); return 0; } diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 0e17bcb632..79b96c7bc1 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -107,8 +107,6 @@ static int format2oss(int format) if (format_table[n][1] == format) return format_table[n][0]; } - mp_msg(MSGT_AO, MSGL_V, "OSS: Unknown/not supported internal format: %s\n", - af_fmt2str_short(format)); return -1; } @@ -118,8 +116,6 @@ static int oss2format(int format) if (format_table[n][0] == format) return format_table[n][1]; } - mp_tmsg(MSGT_GLOBAL, MSGL_ERR, "[AO OSS] Unknown/Unsupported OSS format: %x.\n", - format); return -1; } @@ -204,16 +200,15 @@ static int init(struct ao *ao) if (p->cfg_oss_mixer_channel && p->cfg_oss_mixer_channel[0]) mchan = p->cfg_oss_mixer_channel; - mp_msg(MSGT_AO, MSGL_V, "ao2: %d Hz %d chans %s\n", ao->samplerate, - ao->channels.num, af_fmt2str_short(ao->format)); + MP_VERBOSE(ao, "%d Hz %d chans %s\n", ao->samplerate, + ao->channels.num, af_fmt2str_short(ao->format)); if (mchan) { int fd, devs, i; if ((fd = open(p->oss_mixer_device, O_RDONLY)) == -1) { - mp_tmsg(MSGT_AO, MSGL_ERR, - "[AO OSS] audio_setup: Can't open mixer device %s: %s\n", - p->oss_mixer_device, strerror(errno)); + MP_ERR(ao, "Can't open mixer device %s: %s\n", + p->oss_mixer_device, strerror(errno)); } else { ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs); close(fd); @@ -221,9 +216,8 @@ static int init(struct ao *ao) for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { if (!strcasecmp(mixer_channels[i], mchan)) { if (!(devs & (1 << i))) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS] audio_setup: " - "Audio card mixer does not have channel '%s', " - "using default.\n", mchan); + MP_ERR(ao, "Audio card mixer does not have " + "channel '%s', using default.\n", mchan); i = SOUND_MIXER_NRDEVICES + 1; break; } @@ -232,20 +226,17 @@ static int init(struct ao *ao) } } if (i == SOUND_MIXER_NRDEVICES) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS] audio_setup: Audio card " - "mixer does not have channel '%s', using default.\n", - mchan); + MP_ERR(ao, "Audio card mixer does not have " + "channel '%s', using default.\n", mchan); } } } else { p->oss_mixer_channel = SOUND_MIXER_PCM; } - mp_msg(MSGT_AO, MSGL_V, "audio_setup: using '%s' dsp device\n", p->dsp); - mp_msg(MSGT_AO, MSGL_V, "audio_setup: using '%s' mixer device\n", - p->oss_mixer_device); - mp_msg(MSGT_AO, MSGL_V, "audio_setup: using '%s' mixer device\n", - mixer_channels[p->oss_mixer_channel]); + MP_VERBOSE(ao, "using '%s' dsp device\n", p->dsp); + MP_VERBOSE(ao, "using '%s' mixer device\n", p->oss_mixer_device); + MP_VERBOSE(ao, "using '%s' mixer device\n", mixer_channels[p->oss_mixer_channel]); #ifdef __linux__ p->audio_fd = open(p->dsp, O_WRONLY | O_NONBLOCK); @@ -253,17 +244,14 @@ static int init(struct ao *ao) p->audio_fd = open(p->dsp, O_WRONLY); #endif if (p->audio_fd < 0) { - mp_tmsg(MSGT_AO, MSGL_ERR, - "[AO OSS] audio_setup: Can't open audio device %s: %s\n", - p->dsp, strerror(errno)); + MP_ERR(ao, "Can't open audio device %s: %s\n", p->dsp, strerror(errno)); return -1; } #ifdef __linux__ /* Remove the non-blocking flag */ if (fcntl(p->audio_fd, F_SETFL, 0) < 0) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS] audio_setup: Can't make file " - "descriptor blocking: %s\n", strerror(errno)); + MP_ERR(ao, "Can't make file descriptor blocking: %s\n", strerror(errno)); return -1; } #endif @@ -281,6 +269,8 @@ ac3_retry: ao->format = AF_FORMAT_AC3_NE; oss_format = format2oss(ao->format); if (oss_format == -1) { + MP_VERBOSE(ao, "Unknown/not supported internal format: %s\n", + af_fmt2str_short(ao->format)); #if BYTE_ORDER == BIG_ENDIAN oss_format = AFMT_S16_BE; #else @@ -291,19 +281,20 @@ ac3_retry: if (ioctl(p->audio_fd, SNDCTL_DSP_SETFMT, &oss_format) < 0 || oss_format != format2oss(ao->format)) { - mp_tmsg(MSGT_AO, MSGL_WARN, "[AO OSS] Can't set audio device %s to %s " - "output, trying %s...\n", p->dsp, af_fmt2str_short(ao->format), + MP_WARN(ao, "Can't set audio device %s to %s output, trying %s...\n", + p->dsp, af_fmt2str_short(ao->format), af_fmt2str_short(AF_FORMAT_S16_NE)); ao->format = AF_FORMAT_S16_NE; goto ac3_retry; } ao->format = oss2format(oss_format); - if (ao->format == -1) + if (ao->format == -1) { + MP_ERR(ao, "Unknown/Unsupported OSS format: %x.\n", oss_format); return -1; + } - mp_msg(MSGT_AO, MSGL_V, "audio_setup: sample format: %s\n", - af_fmt2str_short(ao->format)); + MP_VERBOSE(ao, "sample format: %s\n", af_fmt2str_short(ao->format)); if (!AF_FORMAT_IS_AC3(ao->format)) { struct mp_chmap_sel sel = {0}; @@ -317,45 +308,39 @@ ac3_retry: if (ioctl(p->audio_fd, SNDCTL_DSP_CHANNELS, &nchannels) == -1 || nchannels != reqchannels) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS] audio_setup: Failed to " - "set audio device to %d channels.\n", reqchannels); + MP_ERR(ao, "Failed to set audio device to %d channels.\n", + reqchannels); return -1; } } else { int c = reqchannels - 1; if (ioctl(p->audio_fd, SNDCTL_DSP_STEREO, &c) == -1) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS] audio_setup: Failed to " - "set audio device to %d channels.\n", reqchannels); + MP_ERR(ao, "Failed to set audio device to %d channels.\n", + reqchannels); return -1; } if (!ao_chmap_sel_get_def(ao, &sel, &ao->channels, c + 1)) return -1; } - mp_msg(MSGT_AO, MSGL_V, - "audio_setup: using %d channels (requested: %d)\n", - ao->channels.num, reqchannels); + MP_VERBOSE(ao, "using %d channels (requested: %d)\n", + ao->channels.num, reqchannels); // set rate ioctl(p->audio_fd, SNDCTL_DSP_SPEED, &ao->samplerate); - mp_msg(MSGT_AO, MSGL_V, "audio_setup: using %d Hz samplerate\n", - ao->samplerate); + MP_VERBOSE(ao, "using %d Hz samplerate\n", ao->samplerate); } if (ioctl(p->audio_fd, SNDCTL_DSP_GETOSPACE, &p->zz) == -1) { int r = 0; - mp_tmsg(MSGT_AO, MSGL_WARN, "[AO OSS] audio_setup: driver doesn't " - "support SNDCTL_DSP_GETOSPACE\n"); + MP_WARN(ao, "driver doesn't support SNDCTL_DSP_GETOSPACE\n"); if (ioctl(p->audio_fd, SNDCTL_DSP_GETBLKSIZE, &r) == -1) - mp_msg(MSGT_AO, MSGL_V, "audio_setup: %d bytes/frag (config.h)\n", - p->outburst); + MP_VERBOSE(ao, "%d bytes/frag (config.h)\n", p->outburst); else { p->outburst = r; - mp_msg(MSGT_AO, MSGL_V, "audio_setup: %d bytes/frag (GETBLKSIZE)\n", - p->outburst); + MP_VERBOSE(ao, "%d bytes/frag (GETBLKSIZE)\n", p->outburst); } } else { - mp_msg(MSGT_AO, MSGL_V, - "audio_setup: frags: %3d/%d (%d bytes/frag) free: %6d\n", - p->zz.fragments, p->zz.fragstotal, p->zz.fragsize, p->zz.bytes); + MP_VERBOSE(ao, "frags: %3d/%d (%d bytes/frag) free: %6d\n", + p->zz.fragments, p->zz.fragstotal, p->zz.fragsize, p->zz.bytes); p->buffersize = p->zz.bytes; p->outburst = p->zz.fragsize; } @@ -381,9 +366,8 @@ ac3_retry: } free(data); if (p->buffersize == 0) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS]\n *** Your audio driver " - "DOES NOT support select() ***\n Recompile mpv with " - "#undef HAVE_AUDIO_SELECT in config.h !\n\n"); + MP_ERR(ao, "*** Your audio driver DOES NOT support select() ***\n"); + MP_ERR(ao, "Recompile mpv with #undef HAVE_AUDIO_SELECT in config.h!\n"); return -1; } #endif @@ -433,8 +417,8 @@ static void reset(struct ao *ao) close_device(ao); p->audio_fd = open(p->dsp, O_WRONLY); if (p->audio_fd < 0) { - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO OSS]\nFatal error: *** CANNOT " - "RE-OPEN / RESET AUDIO DEVICE *** %s\n", strerror(errno)); + MP_ERR(ao, "Fatal error: *** CANNOT " + "RE-OPEN / RESET AUDIO DEVICE *** %s\n", strerror(errno)); return; } diff --git a/mpvcore/mp_msg.h b/mpvcore/mp_msg.h index 77ae9124c8..7868d9c89d 100644 --- a/mpvcore/mp_msg.h +++ b/mpvcore/mp_msg.h @@ -139,8 +139,8 @@ bool mp_msg_test_log(struct mp_log *log, int lev); char *mp_gtext(const char *string); +// Note: using mp_msg_log or the MP_ERR/... macros is preferred. void mp_msg_va(int mod, int lev, const char *format, va_list va); - void mp_msg(int mod, int lev, const char *format, ... ) PRINTF_ATTRIBUTE(3, 4); void mp_tmsg(int mod, int lev, const char *format, ... ) PRINTF_ATTRIBUTE(3, 4); #define mp_dbg mp_msg diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c index b217eb8f29..4d457eb57b 100644 --- a/video/out/vo_caca.c +++ b/video/out/vo_caca.c @@ -70,7 +70,7 @@ static unsigned int gmask = 0x00ff00; static unsigned int bmask = 0x0000ff; static unsigned int amask = 0; -static int resize(void) +static int resize(struct vo *vo) { screen_w = caca_get_canvas_width(canvas); screen_h = caca_get_canvas_height(canvas); @@ -82,7 +82,7 @@ static int resize(void) depth * image_width, rmask, gmask, bmask, amask); if (dither == NULL) { - mp_msg(MSGT_VO, MSGL_FATAL, "vo_caca: caca_create_dither failed!\n"); + MP_FATAL(vo, "caca_create_dither failed!\n"); return ENOSYS; } dither_buffer = @@ -105,7 +105,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, image_width = width; image_format = format; - return resize(); + return resize(vo); } static void draw_image(struct vo *vo, mp_image_t *mpi) @@ -166,7 +166,7 @@ static void check_events(struct vo *vo) switch (cev.type) { case CACA_EVENT_RESIZE: caca_refresh_display(display); - resize(); + resize(vo); break; case CACA_EVENT_QUIT: mp_input_put_key(vo->input_ctx, MP_KEY_CLOSE_WIN); @@ -250,14 +250,14 @@ static int preinit(struct vo *vo) { canvas = caca_create_canvas(0, 0); if (canvas == NULL) { - mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to create canvas\n"); + MP_ERR(vo, "failed to create canvas\n"); return ENOSYS; } display = caca_create_display(canvas); if (display == NULL) { - mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to create display\n"); + MP_ERR(vo, "failed to create display\n"); caca_free_canvas(canvas); return ENOSYS; } diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 9a3e70b1cd..e265b0b38f 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -114,6 +114,8 @@ struct osdpart { /* Global variables "priv" structure. I try to keep their count low. */ typedef struct d3d_priv { + struct mp_log *log; + int opt_prefer_stretchrect; int opt_disable_textures; int opt_disable_stretchrect; @@ -264,7 +266,7 @@ static bool d3d_begin_scene(d3d_priv *priv) { if (!priv->d3d_in_scene) { if (FAILED(IDirect3DDevice9_BeginScene(priv->d3d_device))) { - mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>BeginScene failed.\n"); + MP_ERR(priv, "BeginScene failed.\n"); return false; } priv->d3d_in_scene = true; @@ -354,9 +356,7 @@ static bool d3dtex_allocate(d3d_priv *priv, struct d3dtex *tex, D3DFORMAT fmt, if (FAILED(IDirect3DDevice9_CreateTexture(priv->d3d_device, tw, th, 1, D3DUSAGE_DYNAMIC, fmt, memtype, &tex->system, NULL))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Allocating %dx%d texture in system RAM failed.\n", - w, h); + MP_ERR(priv, "Allocating %dx%d texture in system RAM failed.\n", w, h); goto error_exit; } @@ -364,9 +364,7 @@ static bool d3dtex_allocate(d3d_priv *priv, struct d3dtex *tex, D3DFORMAT fmt, if (FAILED(IDirect3DDevice9_CreateTexture(priv->d3d_device, tw, th, 1, D3DUSAGE_DYNAMIC, fmt, D3DPOOL_DEFAULT, &tex->device, NULL))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Allocating %dx%d texture in video RAM failed.\n", - w, h); + MP_ERR(priv, "Allocating %dx%d texture in video RAM failed.\n", w, h); goto error_exit; } } @@ -417,8 +415,7 @@ static void d3d_unlock_video_objects(d3d_priv *priv) } if (any_failed) { - mp_msg(MSGT_VO, MSGL_V, - "<vo_direct3d>Unlocking video objects failed.\n"); + MP_VERBOSE(priv, "Unlocking video objects failed.\n"); } } @@ -444,7 +441,7 @@ static void d3d_destroy_video_objects(d3d_priv *priv) */ static void destroy_d3d_surfaces(d3d_priv *priv) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>destroy_d3d_surfaces called.\n"); + MP_VERBOSE(priv, "destroy_d3d_surfaces called.\n"); d3d_destroy_video_objects(priv); @@ -480,12 +477,12 @@ static bool d3d_configure_video_objects(d3d_priv *priv) priv->src_width >> plane->shift_x, priv->src_height >> plane->shift_y)) { - mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Allocating plane %d" + MP_ERR(priv, "Allocating plane %d" " failed.\n", n); return false; } - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Allocated plane %d:" + MP_VERBOSE(priv, "Allocated plane %d:" " %d bit, shift=%d/%d size=%d/%d (%d/%d).\n", n, plane->bits_per_pixel, plane->shift_x, plane->shift_y, @@ -504,7 +501,7 @@ static bool d3d_configure_video_objects(d3d_priv *priv) FAILED(IDirect3DDevice9_CreatePixelShader(priv->d3d_device, (DWORD *)priv->pixel_shader_data, &priv->pixel_shader))) { - mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Failed to create " + MP_ERR(priv, "Failed to create " "YUV conversion pixel shader.\n"); return false; } @@ -517,8 +514,7 @@ static bool d3d_configure_video_objects(d3d_priv *priv) priv->d3d_device, priv->src_width, priv->src_height, priv->movie_src_fmt, D3DPOOL_DEFAULT, &priv->d3d_surface, NULL))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Allocating offscreen surface failed.\n"); + MP_ERR(priv, "Allocating offscreen surface failed.\n"); return false; } } @@ -535,7 +531,7 @@ static bool d3d_lock_video_textures(d3d_priv *priv) if (FAILED(IDirect3DTexture9_LockRect(plane->texture.system, 0, &plane->locked_rect, NULL, 0))) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Texture lock failure.\n"); + MP_VERBOSE(priv, "Texture lock failure.\n"); d3d_unlock_video_objects(priv); return false; } @@ -565,13 +561,13 @@ static void d3d_clear_video_textures(d3d_priv *priv) // done. static bool create_d3d_surfaces(d3d_priv *priv) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>create_d3d_surfaces called.\n"); + MP_VERBOSE(priv, "create_d3d_surfaces called.\n"); if (!priv->d3d_backbuf && FAILED(IDirect3DDevice9_GetBackBuffer(priv->d3d_device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &priv->d3d_backbuf))) { - mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Allocating backbuffer failed.\n"); + MP_ERR(priv, "Allocating backbuffer failed.\n"); return 0; } @@ -614,16 +610,14 @@ static bool init_d3d(d3d_priv *priv) priv->d3d_handle = priv->pDirect3DCreate9(D3D_SDK_VERSION); if (!priv->d3d_handle) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Initializing Direct3D failed.\n"); + MP_ERR(priv, "Initializing Direct3D failed.\n"); return false; } if (FAILED(IDirect3D9_GetAdapterDisplayMode(priv->d3d_handle, D3DADAPTER_DEFAULT, &disp_mode))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Reading display mode failed.\n"); + MP_ERR(priv, "Reading display mode failed.\n"); return false; } @@ -631,17 +625,15 @@ static bool init_d3d(d3d_priv *priv) priv->cur_backbuf_width = disp_mode.Width; priv->cur_backbuf_height = disp_mode.Height; - mp_msg(MSGT_VO, MSGL_V, - "<vo_direct3d>Setting backbuffer dimensions to (%dx%d).\n", - disp_mode.Width, disp_mode.Height); + MP_VERBOSE(priv, "Setting backbuffer dimensions to (%dx%d).\n", + disp_mode.Width, disp_mode.Height); if (FAILED(IDirect3D9_GetDeviceCaps(priv->d3d_handle, D3DADAPTER_DEFAULT, DEVTYPE, &disp_caps))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Reading display capabilities failed.\n"); + MP_ERR(priv, "Reading display capabilities failed.\n"); return false; } @@ -658,13 +650,12 @@ static bool init_d3d(d3d_priv *priv) if (priv->opt_force_power_of_2) priv->device_caps_power2_only = 1; - mp_msg(MSGT_VO, MSGL_V, - "<vo_direct3d>device_caps_power2_only %d, device_caps_square_only %d\n" - "<vo_direct3d>device_texture_sys %d\n" - "<vo_direct3d>max_texture_width %d, max_texture_height %d\n", - priv->device_caps_power2_only, priv->device_caps_square_only, - priv->device_texture_sys, priv->max_texture_width, - priv->max_texture_height); + MP_VERBOSE(priv, "device_caps_power2_only %d, device_caps_square_only %d\n" + "device_texture_sys %d\n" + "max_texture_width %d, max_texture_height %d\n", + priv->device_caps_power2_only, priv->device_caps_square_only, + priv->device_texture_sys, priv->max_texture_width, + priv->max_texture_height); return true; } @@ -724,22 +715,19 @@ static bool change_d3d_backbuffer(d3d_priv *priv) | D3DCREATE_FPU_PRESERVE, &present_params, &priv->d3d_device))) { - mp_msg(MSGT_VO, MSGL_V, - "<vo_direct3d>Creating Direct3D device failed.\n"); + MP_VERBOSE(priv, "Creating Direct3D device failed.\n"); return 0; } } else { if (FAILED(IDirect3DDevice9_Reset(priv->d3d_device, &present_params))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Reseting Direct3D device failed.\n"); + MP_ERR(priv, "Reseting Direct3D device failed.\n"); return 0; } } - mp_msg(MSGT_VO, MSGL_V, - "<vo_direct3d>New backbuffer (%dx%d), VO (%dx%d)\n", - present_params.BackBufferWidth, present_params.BackBufferHeight, - window_w, window_h); + MP_VERBOSE(priv, "New backbuffer (%dx%d), VO (%dx%d)\n", + present_params.BackBufferWidth, present_params.BackBufferHeight, + window_w, window_h); return 1; } @@ -750,7 +738,7 @@ static bool change_d3d_backbuffer(d3d_priv *priv) */ static int reconfigure_d3d(d3d_priv *priv) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>reconfigure_d3d called.\n"); + MP_VERBOSE(priv, "reconfigure_d3d called.\n"); destroy_d3d_surfaces(priv); @@ -781,7 +769,7 @@ static bool resize_d3d(d3d_priv *priv) { D3DVIEWPORT9 vp = {0, 0, priv->vo->dwidth, priv->vo->dheight, 0, 1}; - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>resize_d3d called.\n"); + MP_VERBOSE(priv, "resize_d3d called.\n"); /* Make sure that backbuffer is large enough to accomodate the new viewport dimensions. Grow it if necessary. */ @@ -808,7 +796,7 @@ static bool resize_d3d(d3d_priv *priv) return 0; if (FAILED(IDirect3DDevice9_SetViewport(priv->d3d_device, &vp))) { - mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Setting viewport failed.\n"); + MP_ERR(priv, "Setting viewport failed.\n"); return 0; } @@ -827,7 +815,7 @@ static bool resize_d3d(d3d_priv *priv) */ static void uninit_d3d(d3d_priv *priv) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>uninit_d3d called.\n"); + MP_VERBOSE(priv, "uninit_d3d called.\n"); destroy_d3d_surfaces(priv); @@ -836,7 +824,7 @@ static void uninit_d3d(d3d_priv *priv) priv->d3d_device = NULL; if (priv->d3d_handle) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Stopping Direct3D.\n"); + MP_VERBOSE(priv, "Stopping Direct3D.\n"); IDirect3D9_Release(priv->d3d_handle); } priv->d3d_handle = NULL; @@ -913,8 +901,7 @@ static uint32_t d3d_draw_frame(d3d_priv *priv) priv->d3d_backbuf, &priv->fs_movie_rect, D3DTEXF_LINEAR))) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Copying frame to the backbuffer failed.\n"); + MP_ERR(priv, "Copying frame to the backbuffer failed.\n"); return VO_ERROR; } } @@ -979,13 +966,13 @@ static D3DFORMAT check_format(d3d_priv *priv, uint32_t movie_fmt, priv->desktop_fmt); } if (FAILED(res)) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Rejected image format " + MP_VERBOSE(priv, "Rejected image format " "(%s): %s\n", type, vo_format_name(cur->mplayer_fmt)); return 0; } - mp_msg(MSGT_VO, MSGL_DBG2, "<vo_direct3d>Accepted image format " - "(%s): %s\n", type, vo_format_name(cur->mplayer_fmt)); + MP_DBG(priv, "Accepted image format (%s): %s\n", + type, vo_format_name(cur->mplayer_fmt)); return cur->fourcc; } @@ -1037,7 +1024,7 @@ static bool init_rendering_mode(d3d_priv *priv, uint32_t fmt, bool initialize) if (!(blit_d3dfmt || shader_d3dfmt || texture_d3dfmt)) return false; - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Accepted rendering methods for " + MP_VERBOSE(priv, "Accepted rendering methods for " "format='%s': StretchRect=%#x, Texture=%#x, Texture+Shader=%#x.\n", vo_format_name(fmt), blit_d3dfmt, texture_d3dfmt, shader_d3dfmt); @@ -1066,7 +1053,7 @@ static bool init_rendering_mode(d3d_priv *priv, uint32_t fmt, bool initialize) } if (priv->use_textures) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Using 3D rendering.\n"); + MP_VERBOSE(priv, "Using 3D rendering.\n"); struct texplane *planes = &priv->planes[0]; planes[0].shift_x = planes[0].shift_y = 0; @@ -1078,7 +1065,7 @@ static bool init_rendering_mode(d3d_priv *priv, uint32_t fmt, bool initialize) planes[0].bits_per_pixel = imgfmt_any_rnd_depth(priv->image_format); planes[0].d3d_format = texture_d3dfmt; } else { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Using YUV shaders.\n"); + MP_VERBOSE(priv, "Using YUV shaders.\n"); struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(priv->image_format); priv->plane_count = 3; @@ -1098,7 +1085,7 @@ static bool init_rendering_mode(d3d_priv *priv, uint32_t fmt, bool initialize) } } else { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Using StretchRect.\n"); + MP_VERBOSE(priv, "Using StretchRect.\n"); priv->movie_src_fmt = blit_d3dfmt; } @@ -1161,6 +1148,7 @@ static int preinit(struct vo *vo) { d3d_priv *priv = vo->priv; priv->vo = vo; + priv->log = vo->log; for (int n = 0; n < MAX_OSD_PARTS; n++) { struct osdpart *osd = talloc_ptrtype(priv, osd); @@ -1172,16 +1160,14 @@ static int preinit(struct vo *vo) priv->d3d9_dll = LoadLibraryA("d3d9.dll"); if (!priv->d3d9_dll) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Unable to dynamically load d3d9.dll\n"); + MP_ERR(priv, "Unable to dynamically load d3d9.dll\n"); goto err_out; } priv->pDirect3DCreate9 = (void *)GetProcAddress(priv->d3d9_dll, "Direct3DCreate9"); if (!priv->pDirect3DCreate9) { - mp_msg(MSGT_VO, MSGL_ERR, - "<vo_direct3d>Unable to find entry point of Direct3DCreate9\n"); + MP_ERR(priv, "Unable to find entry point of Direct3DCreate9\n"); goto err_out; } @@ -1192,8 +1178,7 @@ static int preinit(struct vo *vo) * fullscreen dimensions and does other useful stuff. */ if (!vo_w32_init(vo)) { - mp_msg(MSGT_VO, MSGL_V, - "<vo_direct3d>Configuring onscreen window failed.\n"); + MP_VERBOSE(priv, "Configuring onscreen window failed.\n"); goto err_out; } @@ -1290,7 +1275,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, * the given coordinates. */ if (!vo_w32_config(vo, d_width, d_height, options)) { - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Creating window failed.\n"); + MP_VERBOSE(priv, "Creating window failed.\n"); return VO_ERROR; } @@ -1320,7 +1305,7 @@ static void flip_page(struct vo *vo) if (priv->d3d_device && priv->d3d_in_scene) { if (FAILED(IDirect3DDevice9_EndScene(priv->d3d_device))) { - mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>EndScene failed.\n"); + MP_ERR(priv, "EndScene failed.\n"); } } priv->d3d_in_scene = false; @@ -1328,14 +1313,12 @@ static void flip_page(struct vo *vo) RECT rect = {0, 0, vo->dwidth, vo->dheight}; if (!priv->d3d_device || |