[MPlayer-cvslog] r21652 - in trunk: cfg-common.h help/help_mp-en.h stream/stream_dvd.c
nicodvb
subversion at mplayerhq.hu
Sun Dec 17 19:10:49 CET 2006
Author: nicodvb
Date: Sun Dec 17 19:10:49 2006
New Revision: 21652
Modified:
trunk/cfg-common.h
trunk/help/help_mp-en.h
trunk/stream/stream_dvd.c
Log:
support for limiting dvd speed; patch by Tobias Diedrich (ranma tdiedrich se)
Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h (original)
+++ trunk/cfg-common.h Sun Dec 17 19:10:49 2006
@@ -29,8 +29,10 @@
{"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
#if defined(USE_DVDREAD) || defined(USE_DVDNAV)
{"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
#else
{"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
#ifdef USE_DVDREAD
{"dvd", "-dvd N has been removed, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL},
@@ -364,6 +366,10 @@
#endif
+#if defined(USE_DVDREAD) || defined(USE_DVDNAV)
+extern int dvd_speed; /* stream/stream_dvd.c */
+#endif
+
extern float a52_drc_level;
/* defined in libmpdemux: */
Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h (original)
+++ trunk/help/help_mp-en.h Sun Dec 17 19:10:49 2006
@@ -539,6 +539,11 @@
#define MSGTR_CantOpenDVD "Couldn't open DVD device: %s\n"
// stream_dvd.c
+#define MSGTR_DVDspeedCantOpen "Couldn't open DVD device for writing, changing DVD speed needs write access.\n"
+#define MSGTR_DVDrestoreSpeed "Restoring DVD speed... "
+#define MSGTR_DVDlimitSpeed "Limiting DVD speed to %dKB/s... "
+#define MSGTR_DVDlimitFail "Failed.\n"
+#define MSGTR_DVDlimitOk "Ok.\n"
#define MSGTR_NoDVDSupport "MPlayer was compiled without DVD support, exiting.\n"
#define MSGTR_DVDnumTitles "There are %d titles on this DVD.\n"
#define MSGTR_DVDinvalidTitle "Invalid DVD title number: %d\n"
Modified: trunk/stream/stream_dvd.c
==============================================================================
--- trunk/stream/stream_dvd.c (original)
+++ trunk/stream/stream_dvd.c Sun Dec 17 19:10:49 2006
@@ -16,6 +16,14 @@
#include <sys/cdrio.h>
#endif
+#ifdef __linux__
+#include <linux/cdrom.h>
+#include <scsi/sg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#endif
+
#define FIRST_AC3_AID 128
#define FIRST_DTS_AID 136
#define FIRST_MPG_AID 0
@@ -34,6 +42,83 @@
extern int dvd_last_chapter;
extern char* dvd_device;
int dvd_angle=1;
+int dvd_speed=0; /* 0 => don't touch speed */
+
+static void dvd_set_speed(char *device, unsigned speed)
+{
+#if defined(__linux__) && defined(SG_IO) && defined(GPCMD_SET_STREAMING)
+ int fd;
+ unsigned char buffer[28];
+ unsigned char cmd[16];
+ unsigned char sense[16];
+ struct sg_io_hdr sghdr;
+ struct stat st;
+
+ memset(&sghdr, 0, sizeof(sghdr));
+ memset(buffer, 0, sizeof(buffer));
+ memset(sense, 0, sizeof(sense));
+ memset(cmd, 0, sizeof(cmd));
+ memset(&st, 0, sizeof(st));
+
+ if (stat(device, &st) == -1) return;
+
+ if (!S_ISBLK(st.st_mode)) return; /* not a block device */
+
+ if ((fd = open(device, O_RDWR | O_NONBLOCK)) == -1) {
+ mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_DVDspeedCantOpen);
+ return;
+ }
+
+ if (speed < 100) { /* speed times 1350KB/s (DVD single speed) */
+ speed *= 1350;
+ }
+
+ switch (speed) {
+ case 0: /* don't touch speed setting */
+ return;
+ case -1: /* restore default value */
+ if (dvd_speed == 0) return; /* we haven't touched the speed setting */
+ speed = 0;
+ buffer[0] = 4; /* restore default */
+ mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_DVDrestoreSpeed);
+ break;
+ default: /* limit to <speed> KB/s */
+ mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_DVDlimitSpeed, speed);
+ break;
+ }
+
+ sghdr.interface_id = 'S';
+ sghdr.timeout = 5000;
+ sghdr.dxfer_direction = SG_DXFER_TO_DEV;
+ sghdr.mx_sb_len = sizeof(sense);
+ sghdr.dxfer_len = sizeof(buffer);
+ sghdr.cmd_len = sizeof(cmd);
+ sghdr.sbp = sense;
+ sghdr.dxferp = buffer;
+ sghdr.cmdp = cmd;
+
+ cmd[0] = GPCMD_SET_STREAMING;
+ cmd[10] = sizeof(buffer);
+
+ buffer[8] = 0xff; /* first sector 0, last sector 0xffffffff */
+ buffer[9] = 0xff;
+ buffer[10] = 0xff;
+ buffer[11] = 0xff;
+
+ buffer[12] = buffer[20] = (speed >> 24) & 0xff; /* <speed> kilobyte */
+ buffer[13] = buffer[21] = (speed >> 16) & 0xff;
+ buffer[14] = buffer[22] = (speed >> 8) & 0xff;
+ buffer[15] = buffer[23] = speed & 0xff;
+
+ buffer[18] = buffer[26] = 0x03; /* 1 second */
+ buffer[19] = buffer[27] = 0xe8;
+
+ if (ioctl(fd, SG_IO, &sghdr) < 0) {
+ mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_DVDlimitFail);
+ }
+ mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_DVDlimitOk);
+#endif
+}
#ifdef USE_DVDREAD
#define LIBDVDREAD_VERSION(maj,min,micro) ((maj)*10000 + (min)*100 + (micro))
@@ -398,6 +483,7 @@
DVDClose(d->dvd);
dvd_chapter = 1;
dvd_last_chapter = 0;
+ dvd_set_speed(dvd_device, -1); /* -1 => restore default */
}
#endif /* #ifdef USE_DVDREAD */
@@ -743,6 +829,7 @@
return STREAM_UNSUPORTED;
}
}
+ dvd_set_speed(dvd_device, dvd_speed);
mp_msg(MSGT_OPEN,MSGL_V,"Reading disc structure, please wait...\n");
More information about the MPlayer-cvslog
mailing list