diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2010-06-30 14:50:20 +0200 |
---|---|---|
committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2010-06-30 14:50:20 +0200 |
commit | 43f86c503308576c6e835b79d02737470578410e (patch) | |
tree | a4292fa42bf2a81fcb2ac22c526a11b18bc1838d | |
parent | 8a470b5328b2e9e4bbf33d4027bae4bfc5e85c90 (diff) | |
download | vdr-plugin-dxr3-43f86c503308576c6e835b79d02737470578410e.tar.gz vdr-plugin-dxr3-43f86c503308576c6e835b79d02737470578410e.tar.bz2 |
remove DecodeLpcm
I dont konw when this method should get used... so remove it, if
we need it, it is still in git history to restore
-rw-r--r-- | decoder.c | 54 | ||||
-rw-r--r-- | decoder.h | 4 |
2 files changed, 1 insertions, 57 deletions
@@ -232,60 +232,6 @@ void cDecoder::ac3dts(cDxr3PesFrame *frame, iAudio *audio) } } -#if 0 -// ================================== -//! decode lpcm -void cDecoder::DecodeLpcm(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuffer &aBuf) -{ - const uint8_t *buf = frame->GetPayload(); - int length = frame->GetPayloadLength(); - - // all informations about the LPCM header can be found - // here http://dvd.sourceforge.net/dvdinfo/lpcm.html - - if (length > (LPCM_HEADER_LENGTH + 2)) { - // only even number of bytes are allowed - if ((length - LPCM_HEADER_LENGTH) % 2 != 0) { - esyslog("[dxr3-audiodecoder] skipping %d lpcm bytes", length); - return; - } - - // remove header and set pointer to first data byte - const uint8_t *data = buf + LPCM_HEADER_LENGTH; - length -= LPCM_HEADER_LENGTH; - - int codedSpeed = (buf[5] >> 4) & 0x03; - int speed = 0; - - switch (codedSpeed) { - case 1: - speed = 96000; - break; - - case 2: - speed = 44100; - break; - - case 3: - speed = 32000; - break; - - default: - speed = 48000; - break; - } - - int channels = (buf[5] & 0x03); - channels++; - - cFixedLengthFrame* pTempFrame = aBuf.Push(data, length, pts); - if (pTempFrame) { - pTempFrame->channels(channels); - pTempFrame->samplerate(speed); - } - } -} -#endif // ================================== //! checking routine bool cDecoder::checkMpegAudioHdr(const uint8_t *head) @@ -51,9 +51,7 @@ public: AVFrame *decode(AVPacket *source, uint32_t width, uint32_t height); void decode(cDxr3PesFrame *frame, iAudio *audio); void ac3dts(cDxr3PesFrame *frame, iAudio *audio); -/* - void DecodeLpcm(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuffer &aBuf); -*/ + void Reset() { ac3dtsDecoder.Clear(); |