[Mplayer-cvslog] CVS: main/libmpdemux dvdnav_stream.c,NONE,1.1 dvdnav_stream.h,NONE,1.1 Makefile,1.26,1.27 stream.h,1.38,1.39
Arpi of Ize
arpi at mplayer.dev.hu
Wed Apr 3 19:50:51 CEST 2002
Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv24373
Modified Files:
Makefile stream.h
Added Files:
dvdnav_stream.c dvdnav_stream.h
Log Message:
dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer at outflux.net>
--- NEW FILE ---
#include "config.h"
#ifdef USE_DVDNAV
#include <dvdnav_internal.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include "mp_msg.h"
#include "../linux/timer.h"
#include "../input/input.h"
#include "stream.h"
#include "dvdnav_stream.h"
#include "../spudec.h"
int dvd_nav_skip_opening=0; /* skip opening stalls? */
int osd_show_dvd_nav_delay=0; /* count down for dvd nav text on OSD */
char dvd_nav_text[50]; /* for reporting stuff to OSD */
int osd_show_dvd_nav_highlight; /* show highlight area */
int osd_show_dvd_nav_sx; /* start x .... */
int osd_show_dvd_nav_ex;
int osd_show_dvd_nav_sy;
int osd_show_dvd_nav_ey;
int dvd_nav_still=0; /* are we on a still picture? */
dvdnav_priv_t * new_dvdnav_stream(char * filename) {
char * title_str;
dvdnav_priv_t *dvdnav_priv;
if (!filename)
return NULL;
if (!(dvdnav_priv=(dvdnav_priv_t*)calloc(1,sizeof(*dvdnav_priv))))
return NULL;
if (!(dvdnav_priv->filename=strdup(filename))) {
free(dvdnav_priv);
return NULL;
}
if(dvdnav_open(&(dvdnav_priv->dvdnav),dvdnav_priv->filename)!=DVDNAV_STATUS_OK)
{
free(dvdnav_priv->filename);
free(dvdnav_priv);
return NULL;
}
if (!dvdnav_priv->dvdnav) {
free(dvdnav_priv);
return NULL;
}
dvdnav_stream_ignore_timers(dvdnav_priv,dvd_nav_skip_opening);
/* turn on dvdnav caching */
dvdnav_set_readahead_flag(dvdnav_priv->dvdnav,1);
/* report the title?! */
if (dvdnav_get_title_string(dvdnav_priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) {
mp_msg(MSGT_OPEN,MSGL_INFO,"Title: '%s'\n",title_str);
}
return dvdnav_priv;
}
int dvdnav_stream_reset(dvdnav_priv_t * dvdnav_priv) {
if (!dvdnav_priv) return 0;
// if (dvdnav_reset(dvdnav_priv->dvdnav)!=DVDNAV_STATUS_OK)
return 0;
dvdnav_priv->started=0;
return 1;
}
void free_dvdnav_stream(dvdnav_priv_t * dvdnav_priv) {
if (!dvdnav_priv) return;
dvdnav_close(dvdnav_priv->dvdnav);
dvdnav_priv->dvdnav=NULL;
free(dvdnav_priv);
}
void dvdnav_stream_ignore_timers(dvdnav_priv_t * dvdnav_priv, int ignore) {
if (!dvdnav_priv) return;
dvdnav_priv->ignore_timers=ignore;
}
int dvdnav_stream_sleeping(dvdnav_priv_t * dvdnav_priv) {
unsigned int now;
if (!dvdnav_priv) return 0;
if(dvdnav_priv->sleeping)
{
now=GetTimer();
while(dvdnav_priv->sleeping>1 || now<dvdnav_priv->sleep_until) {
// printf("%s %u<%u\n",__FUNCTION__,now,dvdnav_priv->sleep_until);
// usec_sleep(1000); /* 1ms granularity */
return 1;
}
dvdnav_still_skip(dvdnav_priv->dvdnav); // continue past...
dvdnav_priv->sleeping=0;
printf("%s: woke up!\n",__FUNCTION__);
}
dvd_nav_still=0;
printf("%s: active\n",__FUNCTION__);
return 0;
}
void dvdnav_stream_sleep(dvdnav_priv_t * dvdnav_priv, int seconds) {
if (!dvdnav_priv) return;
if (!dvdnav_priv->started) return;
dvdnav_priv->sleeping=0;
switch (seconds) {
case 0:
return;
case 0xff:
printf( "Sleeping indefinately\n" );
dvdnav_priv->sleeping=2;
break;
default:
printf( "Sleeping %d sec(s)\n", seconds );
dvdnav_priv->sleep_until = GetTimer();// + seconds*1000000;
dvdnav_priv->sleeping=1;
break;
}
//if (dvdnav_priv->started) dvd_nav_still=1;
}
void dvdnav_stream_add_event(dvdnav_priv_t* dvdnav_priv, int event, unsigned char *buf, int len) {
//printf("%s: %d\n",__FUNCTION__,event);
dvdnav_event_t * dvdnav_event;
mp_cmd_t * cmd;
if (!dvdnav_priv->started) return;
if (!(dvdnav_event=(dvdnav_event_t*)calloc(1,sizeof(*dvdnav_event)))) {
printf("%s: dvdnav_event: out of memory!\n",__FUNCTION__);
return;
}
dvdnav_event->event=event;
dvdnav_event->details=calloc(1,len);
memcpy(dvdnav_event->details,buf,len);
dvdnav_event->len=len;
if (!(cmd = (mp_cmd_t*)calloc(1,sizeof(*cmd)))) {
printf("%s: mp_cmd_t: out of memory!\n",__FUNCTION__);
free(dvdnav_event->details);
free(dvdnav_event);
return;
}
cmd->id=MP_CMD_DVDNAV_EVENT; // S+event;
cmd->name=strdup("dvdnav_event"); // FIXME: do I really need a 'name'?
cmd->nargs=1;
cmd->args[0].v.v=dvdnav_event;
mp_input_queue_cmd(cmd);
}
void dvdnav_stream_read(dvdnav_priv_t * dvdnav_priv, unsigned char *buf, int *len) {
int event = DVDNAV_NOP;
if (!len) return;
*len=-1;
if (!dvdnav_priv) return;
if (!buf) return;
if (dvd_nav_still) {
printf("%s: got a stream_read while I should be asleep!\n",__FUNCTION__);
*len=0;
return;
}
if (dvdnav_get_next_block(dvdnav_priv->dvdnav,buf,&event,len)!=DVDNAV_STATUS_OK) {
printf( "Error getting next block from DVD (%s)\n",dvdnav_err_to_string(dvdnav_priv->dvdnav) );
*len=-1;
}
else if (event!=DVDNAV_BLOCK_OK) {
// need to handle certain events internally (like skipping stills)
switch (event) {
case DVDNAV_STILL_FRAME: {
dvdnav_still_event_t *still_event = (dvdnav_still_event_t*)(buf);
printf("************************************************************ STILL \n");
//if (dvdnav_priv->started) dvd_nav_still=1;
//else
dvdnav_still_skip(dvdnav_priv->dvdnav); // don't let dvdnav stall on this image
break;
}
}
// got an event, repeat the read
dvdnav_stream_add_event(dvdnav_priv,event,buf,*len);
*len=0;
}
// printf("%s: got %d\n",__FUNCTION__,*len);
}
void dvdnav_stream_fullstart(dvdnav_priv_t * dvdnav_priv) {
if (dvdnav_priv && !dvdnav_priv->started) {
dvdnav_stream_reset(dvdnav_priv);
dvdnav_priv->started=1;
}
}
unsigned int * dvdnav_stream_get_palette(dvdnav_priv_t * dvdnav_priv) {
if (!dvdnav_priv) {
printf("%s: NULL dvdnav_priv\n",__FUNCTION__);
return NULL;
}
if (!dvdnav_priv->dvdnav) {
printf("%s: NULL dvdnav_priv->dvdnav\n",__FUNCTION__);
return NULL;
}
if (!dvdnav_priv->dvdnav->vm) {
printf("%s: NULL dvdnav_priv->dvdnav->vm\n",__FUNCTION__);
return NULL;
}
if (!dvdnav_priv->dvdnav->vm->state.pgc) {
printf("%s: NULL dvdnav_priv->dvdnav->vm->state.pgc\n",__FUNCTION__);
return NULL;
}
return dvdnav_priv->dvdnav->vm->state.pgc->palette;
}
#endif /* USE_DVDNAV */
--- NEW FILE ---
#ifndef _MPLAYER_DVDNAV_STREAM_H
#define _MPLAYER_DVDNAV_STREAM_H
#include <dvdnav.h>
typedef struct {
int event; /* event number fromd dvdnav_events.h */
void * details; /* event details */
int len; /* bytes in details */
} dvdnav_event_t;
typedef struct {
dvdnav_t * dvdnav; /* handle to libdvdnav stuff */
char * filename; /* path */
int ignore_timers; /* should timers be skipped? */
int sleeping; /* are we sleeping? */
unsigned int sleep_until; /* timer */
int started; /* Has mplayer initialization finished? */
unsigned char prebuf[STREAM_BUFFER_SIZE]; /* prefill buffer */
int prelen; /* length of prefill buffer */
} dvdnav_priv_t;
extern int dvd_nav_still;
extern int dvd_nav_skip_opening;
extern char dvd_nav_text[50];
extern int osd_show_dvd_nav_delay;
extern int osd_show_dvd_nav_highlight;
extern int osd_show_dvd_nav_sx;
extern int osd_show_dvd_nav_ex;
extern int osd_show_dvd_nav_sy;
extern int osd_show_dvd_nav_ey;
dvdnav_priv_t * new_dvdnav_stream(char * filename);
int dvdnav_stream_reset(dvdnav_priv_t * dvdnav_priv);
void free_dvdnav_stream(dvdnav_priv_t * dvdnav_priv);
void dvdnav_stream_ignore_timers(dvdnav_priv_t * dvdnav_priv, int ignore);
void dvdnav_stream_read(dvdnav_priv_t * dvdnav_priv, unsigned char *buf, int *len);
void dvdnav_stream_sleep(dvdnav_priv_t *dvdnav_priv, int seconds);
int dvdnav_stream_sleeping(dvdnav_priv_t * dvdnav_priv);
void dvdnav_stream_fullstart(dvdnav_priv_t *dvdnav_priv);
unsigned int * dvdnav_stream_get_palette(dvdnav_priv_t * dvdnav_priv);
#endif
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile 24 Mar 2002 02:25:41 -0000 1.26
+++ Makefile 3 Apr 2002 17:50:48 -0000 1.27
@@ -3,7 +3,7 @@
include ../config.mak
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_viv.c demuxer.c dvdauth.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c
+SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c
ifeq ($(STREAMING),yes)
SRCS += asf_streaming.c url.c http.c network.c rtp.c
endif
Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- stream.h 28 Mar 2002 20:40:05 -0000 1.38
+++ stream.h 3 Apr 2002 17:50:48 -0000 1.39
@@ -16,7 +16,7 @@
#define STREAMTYPE_PLAYLIST 6
#define STREAMTYPE_MF 7
#define STREAMTYPE_DS 8
-#define STREAMTYPE_DVDNAV 9
+#define STREAMTYPE_DVDNAV 9 // we cannot safely "seek" in this...
#define VCD_SECTOR_SIZE 2352
#define VCD_SECTOR_OFFS 24
@@ -201,6 +201,10 @@
extern int dvd_nav;
int dvd_parse_chapter_range(struct config*, const char*);
//#endif
+
+#ifdef USE_DVDNAV
+#include "dvdnav_stream.h"
+#endif
#ifdef USE_DVDREAD
More information about the MPlayer-cvslog
mailing list