mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: add --with-tremor configure option to use libvorbisidec

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1113 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-02-05 14:54:24 +00:00
parent a0dc61664c
commit 0f1f445921
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/audiodec/oggdec.cpp
View File

@@ -137,14 +137,14 @@ CBaseDec::RetCode COggDec::Decoder(FILE *in, const int OutputFd, State* const st
}
bytes=0;
if(mSeekable)
#ifdef DBOX
#ifdef USE_TREMOR
mSlotTime[mWriteSlot] = ov_time_tell(&vf);
#else
mSlotTime[mWriteSlot] = (ogg_int64_t)(1000 * ov_time_tell(&vf));
#endif
do
{
#ifdef DBOX
#ifdef USE_TREMOR
rval = ov_read(&vf, mPcmSlots[mWriteSlot]+bytes, mSlotSize-bytes, &bitstream);
#else
rval = ov_read(&vf, mPcmSlots[mWriteSlot]+bytes, mSlotSize-bytes, 0, 2, 1, &bitstream);
@@ -286,7 +286,7 @@ void COggDec::SetMetaData(OggVorbis_File* vf, CAudioMetaData* m)
m->bitrate = ov_info(vf,0)->bitrate_nominal;
m->samplerate = ov_info(vf,0)->rate;
if(mSeekable)
#ifdef DBOX
#ifdef USE_TREMOR
m->total_time = (time_t) ov_time_total(vf, 0) / 1000;
#else
m->total_time = (time_t) ov_time_total(vf, 0);

2
src/driver/audiodec/oggdec.h
View File

@@ -38,7 +38,7 @@
#include <pthread.h>
#include <basedec.h>
#include <driver/audiometadata.h>
#ifdef DBOX
#ifdef USE_TREMOR
#include <tremor/ogg.h>
#include <tremor/ivorbisfile.h>
#else