[MPlayer-dev-eng] Re: removing internal tremor

[Diego Biurrun]

On Tue, Aug 08, 2006 at 07:44:33PM +0200, Reimar Döffinger wrote:
> On Tue, Aug 08, 2006 at 07:21:32PM +0200, Diego Biurrun wrote:
> > On Tue, Aug 08, 2006 at 05:02:16PM +0200, Reimar Döffinger wrote:
> > > Yes, but I had to add two hacks:
> > > in ad_libvorbis:
> > > #define vorbis_synthesis(b, p) vorbis_synthesis(b, p, 1)
> > > in demux_mov.c
> > > -#include <tremor/ogg.h>
> > > +#include <ogg/ogg.h>
> > > 
> > > Both are of course not acceptable for inclusion in SVN...
> > 
> > What exactly did you change?  There should be a way to make the changes
> > acceptable...
> 
> I'd need another define that tells if we use internal tremor or external
> (for which I'd only support latest SVN).
> Attached is the patch that is needed for latest tremor.

IMO latest SVN is perfectly fine, there are no Tremor releases anyway
AFAIK.

Giving you another define is trivial, what do you think about my slightly
modified version?

> > I now get the following and no sound:
> 
> I have not idea. Could be caused by both that file or that tremor
> version you are using.
> I so far tested audio-only ogg and ogg with theora video without
> problems so far.

Hmmmmmm.  What Tremor and libogg version do you use exactly?  I cannot
get rid of that error message...

> > > I pretty much excluded 3) for other reasons, too.
> > 
> > Well, maybe there is a way to improve the libavformat demuxer to the
> > point that it can fuly replace the native one.  What are the problems we
> > need to address?  Off the top of my head I remember:
> 
> The approach is very different, not to mention that we would loose
> decoding via the theora lib. Given how very unstable our support for
> both ogg and theora is I really wouldn't like to loose this possibility
> to test and work around bugs. And honestly, I can't really see anyone
> wanting to work on the libavf ogg demuxer, ogg seems to be unanimously
> hated.

We don't need to remove native demuxer.  It can stay in place for those
who are willing to link against libogg and Tremor.  It would be nice to
have a good replacement, though.

Diego
-------------- next part --------------
Index: libmpcodecs/ad_libvorbis.c
===================================================================
--- libmpcodecs/ad_libvorbis.c	(revision 19362)
+++ libmpcodecs/ad_libvorbis.c	(working copy)
@@ -21,6 +21,9 @@
 
 #ifdef TREMOR
 #include <tremor/ivorbiscodec.h>
+#ifndef TREMOR_INTERNAL
+#define vorbis_synthesis(b, p) vorbis_synthesis(b, p, 1)
+#endif
 #else
 #include <vorbis/codec.h>
 #endif
Index: configure
===================================================================
--- configure	(revision 19362)
+++ configure	(working copy)
@@ -5579,6 +5579,7 @@
   _vorbis=yes
   _def_vorbis='#define HAVE_OGGVORBIS 1'
   _def_tremor='#define TREMOR 1'
+  _def_tremor_internal='#define TREMOR_INTERNAL 1'
   _codecmodules="tremor(internal) $_codecmodules"
   _res_comment="internal Tremor"
   if test "$_tremor_low" = yes ; then
@@ -8012,6 +8013,7 @@
 /* enable OggVorbis support */
 $_def_vorbis
 $_def_tremor
+$_def_tremor_internal
 
 /* enable Speex support */
 $_def_speex
Index: libmpdemux/demux_ogg.c
===================================================================
--- libmpdemux/demux_ogg.c	(revision 19362)
+++ libmpdemux/demux_ogg.c	(working copy)
@@ -19,7 +19,7 @@
 #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o')
 
 #ifdef TREMOR
-#include <tremor/ogg.h>
+#include <ogg/ogg.h>
 #include <tremor/ivorbiscodec.h>
 #else
 #include <ogg/ogg.h>