Commit aee5d77c authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* fix livedotcom contrib

* add libcaca contrib
parent 2439413b
......@@ -2,7 +2,7 @@
# src/Makefile : Dearchive and compile all files necessary
# ***************************************************************************
# Copyright (C) 2003 VideoLAN
# $Id: Makefile,v 1.7 2003/12/07 20:47:19 hartman Exp $
# $Id: Makefile,v 1.8 2003/12/07 22:23:00 hartman Exp $
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
#
......@@ -42,7 +42,7 @@ export LDFLAGS = -L$(PREFIX)/lib
all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .lame .ebml .matroska .ffmpeg .openslp \
.dvdcss .dvdread .dvdplay .dvbpsi .live .goom
.dvdcss .dvdread .dvdplay .dvbpsi .live .goom .caca
FORCE:
# ***************************************************************************
......@@ -668,6 +668,25 @@ CLEAN_FILE += .goom
CLEAN_PKG += goom
DISTCLEAN_PKG += goom-dj.tar.gz
# ***************************************************************************
# libcaca
# ***************************************************************************
libcaca-$(LIBCACA_VERSION).tar.gz:
$(WGET) $(LIBCACA_URL)
libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
$(EXTRACT_GZ)
.caca: libcaca
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
touch $@
CLEAN_FILE += .caca
CLEAN_PKG += libcaca
DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz
# ***************************************************************************
# ***************************************************************************
# Some cleansing
# ***************************************************************************
......
......@@ -22,3 +22,47 @@ diff -ru live/groupsock/NetInterface.cpp live-patched/groupsock/NetInterface.cpp
#endif
////////// NetInterface //////////
diff -ru live/liveMedia/MP3Internals.cpp live-patched/liveMedia/MP3Internals.cpp
--- live/liveMedia/MP3Internals.cpp Thu Nov 6 03:53:16 2003
+++ live-patched/liveMedia/MP3Internals.cpp Sun Dec 7 23:10:46 2003
@@ -27,7 +27,7 @@
// This is crufty old code that needs to be cleaned up #####
-unsigned tabsel_123[2][3][16] = {
+unsigned live_tabsel_123[2][3][16] = {
{ {32,32,64,96,128,160,192,224,256,288,320,352,384,416,448,448},
{32,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,384},
{32,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,320} },
@@ -36,9 +36,9 @@
{8,8,16,24,32,40,48,56,64,80,96,112,128,144,160,160},
{8,8,16,24,32,40,48,56,64,80,96,112,128,144,160,160} }
};
-/* Note: tabsel_123[*][*][0 or 15] shouldn't occur; use dummy values there */
+/* Note: live_tabsel_123[*][*][0 or 15] shouldn't occur; use dummy values there */
-long freqs[7] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 };
+long live_freqs[7] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 };
static double ispow[8207];
static double aa_ca[8], aa_cs[8];
@@ -369,8 +369,8 @@
#endif
}
- bitrate = tabsel_123[isMPEG2][layer-1][bitrateIndex];
- samplingFreq = freqs[samplingFreqIndex];
+ bitrate = live_tabsel_123[isMPEG2][layer-1][bitrateIndex];
+ samplingFreq = live_freqs[samplingFreqIndex];
isStereo = (stereo > 1);
isFreeFormat = (bitrateIndex == 0);
frameSize
@@ -831,7 +831,7 @@
static unsigned MP3BitrateToBitrateIndex(unsigned bitrate /* in kbps */,
Boolean isMPEG2) {
for (unsigned i = 1; i < 15; ++i) {
- if (tabsel_123[isMPEG2][2][i] >= bitrate)
+ if (live_tabsel_123[isMPEG2][2][i] >= bitrate)
return i;
}
......@@ -2,7 +2,7 @@
# src/packages.mak : Archives locations
# ***************************************************************************
# Copyright (C) 2003 VideoLAN
# $Id: packages.mak,v 1.4 2003/12/07 20:47:19 hartman Exp $
# $Id: packages.mak,v 1.5 2003/12/07 22:23:00 hartman Exp $
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
#
......@@ -83,4 +83,7 @@ LIBDVBPSI_URL=http://www.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbp
LIVEDOTCOM_VERSION=2003.11.06
LIVEDOTCOM_URL=http://www.videolan.org/pub/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz
LIBCACA_VERSION=0.2
LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment