comparison stream/stream_dvd.c @ 25037:ee99e07b2139

Use AV_WB32 instead of manual bit-fiddling when setting DVD speed

25036:1bc77e1220f3

#include "m_struct.h"

#include "stream_dvd.h"
#include "stream_dvd_common.h"
#include "libmpdemux/demuxer.h"

extern int stream_cache_size;
extern char* dvd_device;
int dvd_angle=1;
int dvd_speed=0; /* 0 => don't touch speed */

  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) {

25037:ee99e07b2139

#include "m_struct.h"

#include "stream_dvd.h"
#include "stream_dvd_common.h"
#include "libmpdemux/demuxer.h"
#include "libavutil/intreadwrite.h"

extern int stream_cache_size;
extern char* dvd_device;
int dvd_angle=1;
int dvd_speed=0; /* 0 => don't touch speed */

  buffer[8] = 0xff;  /* first sector 0, last sector 0xffffffff */
  buffer[9] = 0xff;
  buffer[10] = 0xff;
  buffer[11] = 0xff;

  /* <speed> kilobyte */
  AV_WB32(buffer + 12, speed);
  AV_WB32(buffer + 20, speed);

  buffer[18] = buffer[26] = 0x03; /* 1 second */
  buffer[19] = buffer[27] = 0xe8;

  if (ioctl(fd, SG_IO, &sghdr) < 0) {