RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug which would cause gibberish to be printed when using :noprebuf 

Removed equalization code, it caused problems with older machines, until
someone with a fast machine can betatest it it's only worthless


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4724 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mswitch 2002-02-16 12:51:33 +00:00
parent d60bfc5654
commit 49ab796720
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvo/vo_dxr3.c
View File

@ -6,6 +6,10 @@
*/ */
/* ChangeLog added 2002-01-10 /* ChangeLog added 2002-01-10
* 2002-02-16:
* Fixed bug which would case invalid output when using :noprebuf
* Removed equalization code, it caused problems on slow systems
*
* 2002-02-13: * 2002-02-13:
* Using the swscaler instead of the old hand coded shit. (Checkout man mplayer and search for sws ;). * Using the swscaler instead of the old hand coded shit. (Checkout man mplayer and search for sws ;).
* Using aspect function to setup a proper mpeg1, no more hassling with odd resolutions or GOP-sizes, * Using aspect function to setup a proper mpeg1, no more hassling with odd resolutions or GOP-sizes,
@ -364,8 +368,10 @@ static uint32_t draw_frame(uint8_t * src[])
static void flip_page(void) static void flip_page(void)
{ {
fd_set rfds; if (!vo_fps) {
struct timeval tv; ioval = 90000.0 / vo_fps;
ioctl(fd_control, EM8300_IOCTL_SCR_SETSPEED, &ioval);
}
#ifdef USE_LIBAVCODEC #ifdef USE_LIBAVCODEC
if (img_format == IMGFMT_YV12) { if (img_format == IMGFMT_YV12) {
int out_size = avcodec_encode_video(avc_context, avc_outbuf, avc_outbuf_size, &avc_picture); int out_size = avcodec_encode_video(avc_context, avc_outbuf, avc_outbuf_size, &avc_picture);
@ -375,11 +381,6 @@ static void flip_page(void)
write(fd_video, avc_outbuf, out_size); write(fd_video, avc_outbuf, out_size);
} }
#endif #endif
tv.tv_sec = 0;
tv.tv_usec = 1e6 / floor(vo_fps);
FD_ZERO(&rfds);
FD_SET(fd_video, &rfds);
select(fd_video + 1, NULL, &rfds, NULL, &tv);
} }
static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0) static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0)
@ -428,15 +429,17 @@ static uint32_t preinit(const char *arg)
int fdflags = O_WRONLY; int fdflags = O_WRONLY;
/* Open the control interface */ /* Open the control interface */
if (vo_subdevice) {
if (!strcmp("noprebuf", vo_subdevice)) { if (!strcmp("noprebuf", vo_subdevice)) {
printf("VO: [dxr3] Disabling prebuffering.\n"); printf("VO: [dxr3] Disabling prebuffering.\n");
noprebuf = 1; noprebuf = 1;
fdflags |= O_NONBLOCK; fdflags |= O_NONBLOCK;
} else { free(vo_subdevice);
vo_subdevice = NULL;
}
if (vo_subdevice) {
printf("VO: [dxr3] Forcing use of device %s\n", vo_subdevice); printf("VO: [dxr3] Forcing use of device %s\n", vo_subdevice);
sprintf(devname, "/dev/em8300-%s", vo_subdevice); sprintf(devname, "/dev/em8300-%s", vo_subdevice);
}
} else { } else {
/* Try new naming scheme by default */ /* Try new naming scheme by default */
sprintf(devname, "/dev/em8300-0"); sprintf(devname, "/dev/em8300-0");