[MPlayer-dev-eng] [PATCH] tivo vstream

[Joey Parrish]

On Thu, Aug 12, 2004 at 03:21:25PM +0200, Torinthiel wrote:
> On Wed, Aug 11, 2004 at 07:11:05PM -0500, Joey Parrish wrote:
> > diff -Nur main.sofar/configure main.dev/configure
> > --- main.sofar/configure	2004-08-10 03:07:20.000000000 +0000
> > +++ main.dev/configure	2004-08-11 03:18:37.485750400 +0000
> > @@ -248,6 +248,7 @@
> >    --enable-zr            build with ZR360[56]7/ZR36060 support [autodetect]
> >    --enable-bl		 build with Blinkenlights support [disable]
> >    --enable-tdfxvid       build with tdfx_vid support [disable]
> > +  --disable-vstream      build with TiVo vstream [enable]
> If the option is disable then the text should say _without_.

Got it.  Will be fixed before commit.

> > @@ -4532,6 +4536,13 @@
> >  fi
> >  echores "$_cdparanoia"
> >  
> > +echocheck "vstream"
> > +if test "$_vstream" = yes ; then
> > +    _def_vstream='#define HAVE_VSTREAM 1'
> > +else
> > +_def_vstream='#undef HAVE_VSTREAM'
> > +fi
> > +echores "$_vstream"
> Is there really no test necessary? Also I get it as one of the input
> modules. So please add name to _inputmodules and _noinputmodules, so
> that it gets displayed properly when configure reports what it has
> detected.

Okay.

> > diff -Nur main.sofar/vstream/Makefile main.dev/vstream/Makefile
> > --- main.sofar/vstream/Makefile	1970-01-01 00:00:00.000000000 +0000
> > +++ main.dev/vstream/Makefile	2004-08-11 03:18:37.796196800 +0000
> > @@ -0,0 +1,48 @@
> > +
> > +LIBNAME = vstream.a
> > +
> > +include ../config.mak
> > +
> > +SRCS = mfs.c object.c schema.c query.c util.c bitmap.c io.c partition.c crc.c  vstream.c
> > +
> > +OBJS	= $(SRCS:.c=.o)
> > +OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
> 
> You use C++? Haven't noticed.

Again, not my code.  http://tivo-mplayer.sf.net/

I'll decruft the Makefile before commit.

> > +INCLUDE = -I..
> > +CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(EXTRA_INC)
> Whoa, really need those XMMS_CFLAGS and CDPARANOIA_INC?
> > +CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE)
> > +CPLUSPLUS = $(CC)
> Same here,
> 
> > +.SUFFIXES: .c .cpp .o
> and here
> > +
> > +# .PHONY: all clean
> > +
> > +all:	$(LIBNAME)
> > +
> > +.c.o:
> > +	$(CC) -c $(CFLAGS) -o $@ $<
> > +.cpp.o:
> > +	$(CPLUSPLUS) -c $(CPLUSPLUSFLAGS) -o $@ $<
> And yet again here
> > +
> > +$(LIBNAME):	$(OBJS)
> > +	$(AR) r $(LIBNAME) $(OBJS)
> > +
> > +test: $(LIBNAME) test.c
> > +	$(CC) $(CFLAGS) test.c $(LIBNAME) -o test
> > +
> > +clean:
> > +	rm -f *.o *.a *~
> Shouldn't it remove test as well?
> By the way, are the test and README useful for anything?

test is just to test the vstream lib without MPlayer.  I used it to
create a simple client app to extract streams for archival.  Doesn't
really need to be in CVS, though.

> > diff -Nur main.sofar/vstream/mkproto.awk main.dev/vstream/mkproto.awk
> > --- main.sofar/vstream/mkproto.awk	1970-01-01 00:00:00.000000000 +0000
> > +++ main.dev/vstream/mkproto.awk	2004-08-11 03:18:38.186758400 +0000
> 
> And what is this file for? I haven't seen it used anywhere.

No clue.  I'll remove it.

> Also consider patching AUTHORS, Copyright, manpage (at least synopsis,
> I'm not sure if anything else), documentation (I'm even less sure if
> it's needed. If so, then probably the input formats section,
> formats.xml. I don't know, however, if tivo uses some new format) and
> MAINTAINERS (if you want the module to be maintained of course).

I'll get on that.  I'll also offer the tivo-mplayer authors to write
docs, since I'm lazy and it's their code.  :)

--Joey

-- 
"Are disorders necessarily bad?" --Ike