diff options
| -rw-r--r-- | dxr3audiodecoder.c | 22 | ||||
| -rw-r--r-- | dxr3audiodecoder.h | 5 |
2 files changed, 3 insertions, 24 deletions
diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c index 0535ab7..1c2470f 100644 --- a/dxr3audiodecoder.c +++ b/dxr3audiodecoder.c @@ -89,8 +89,7 @@ void cDxr3AudioDecoder::Init() exit(-1); } - rate = channels = -1; - foundHeader = false; + foundHeader = false; decodeAudio = true; //lastHeader[0] = 0xFF; @@ -163,21 +162,6 @@ void cDxr3AudioDecoder::Decode(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuff if (len < 0 || out_size < 0) throw WRONG_LENGTH; - if (contextAudio->sample_rate != rate) - { - dsyslog("dxr3: audiodecoder: sample rate=%d", - contextAudio->sample_rate); - if (rate != -1) throw UNEXPECTED_PARAMETER_CHANGE; - rate = contextAudio->sample_rate; - } - if (contextAudio->channels != channels) - { - dsyslog("dxr3: audiodecoder: channels=%d", - contextAudio->channels); - if (channels != -1) - throw UNEXPECTED_PARAMETER_CHANGE; - channels = contextAudio->channels; - } if (out_size) { cFixedLengthFrame* pTempFrame = aBuf.Push(pcmbuf, @@ -185,8 +169,8 @@ void cDxr3AudioDecoder::Decode(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuff if (pTempFrame) { // TODO: should we break out of the loop on push timeout? - pTempFrame->SetChannelCount(channels); - pTempFrame->SetSampleRate(rate); + pTempFrame->SetChannelCount(contextAudio->channels); + pTempFrame->SetSampleRate(contextAudio->sample_rate); } } length -= len; diff --git a/dxr3audiodecoder.h b/dxr3audiodecoder.h index 29ead1a..d81b66a 100644 --- a/dxr3audiodecoder.h +++ b/dxr3audiodecoder.h @@ -50,9 +50,6 @@ public: void DecodeAc3Dts(const uint8_t* pPes, const uint8_t* buf, int length, uint32_t pts, cDxr3SyncBuffer &aBuf); - int GetRate() const { return rate; } - int GetChannelCount() const { return channels; } - void Reset() { ac3dtsDecoder.Clear(); @@ -72,8 +69,6 @@ private: bool foundHeader; bool decodeAudio; - int rate; - int channels; uint8_t lastHeader[4]; uint8_t pcmbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE]; }; |