diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-03-04 00:26:13 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-03-04 00:27:20 +0300 |
| commit | 1969fa346643fb624349356dc526071827c51b72 (patch) | |
| tree | ef2364135cf30deb65c6d99a8c291bd01864251c /decoder | |
| parent | b9097a36fa4960ea8a2c1977e73a510dd9aa620a (diff) | |
Remove bitrate field from bitstream parser, its unused.
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/LAVAudio/BitstreamParser.cpp | 3 | ||||
| -rw-r--r-- | decoder/LAVAudio/BitstreamParser.h | 1 | ||||
| -rw-r--r-- | decoder/LAVAudio/parser/dts.cpp | 3 | ||||
| -rw-r--r-- | decoder/LAVAudio/parser/dts.h | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/decoder/LAVAudio/BitstreamParser.cpp b/decoder/LAVAudio/BitstreamParser.cpp index d9d29179..e0ba5962 100644 --- a/decoder/LAVAudio/BitstreamParser.cpp +++ b/decoder/LAVAudio/BitstreamParser.cpp @@ -41,7 +41,6 @@ void CBitstreamParser::Reset() m_dwBlocks = 0; m_dwFrameSize = 0; m_dwSampleRate = 0; - m_dwBitRate = 0; m_dwSamples = 0; m_bDTSHD = FALSE; memset(&m_DTSHeader, 0, sizeof(m_DTSHeader)); @@ -70,7 +69,6 @@ HRESULT CBitstreamParser::ParseDTS(BYTE *pBuffer, DWORD dwSize) m_dwBlocks = m_DTSHeader.Blocks; m_dwSampleRate = m_DTSHeader.SampleRate; - m_dwBitRate = m_DTSHeader.Bitrate; m_dwFrameSize = m_DTSHeader.FrameSize; m_dwSamples = m_DTSHeader.SamplesPerBlock * m_dwBlocks; @@ -81,7 +79,6 @@ HRESULT CBitstreamParser::ParseAC3(BYTE *pBuffer, DWORD dwSize, void *pParserCon { AACAC3ParseContext *ctx = (AACAC3ParseContext *)pParserContext; - m_dwBitRate = ctx->bit_rate; m_dwSampleRate = ctx->sample_rate; // E-AC3 always combines 6 blocks, resulting in 1536 samples diff --git a/decoder/LAVAudio/BitstreamParser.h b/decoder/LAVAudio/BitstreamParser.h index 56434b4f..3782e69f 100644 --- a/decoder/LAVAudio/BitstreamParser.h +++ b/decoder/LAVAudio/BitstreamParser.h @@ -39,7 +39,6 @@ public: DWORD m_dwSampleRate = 0; DWORD m_dwBlocks = 0; DWORD m_dwFrameSize = 0; - DWORD m_dwBitRate = 0; DWORD m_dwSamples = 0; BOOL m_bDTSHD = FALSE; diff --git a/decoder/LAVAudio/parser/dts.cpp b/decoder/LAVAudio/parser/dts.cpp index 444cbe97..7e992b40 100644 --- a/decoder/LAVAudio/parser/dts.cpp +++ b/decoder/LAVAudio/parser/dts.cpp @@ -244,8 +244,7 @@ int parse_dts_header(DTSParserContext *pContext, DTSHeader *pHeader, uint8_t *pB pHeader->ChannelLayout = get_bits(gb, 6); /* Channel configuration */ unsigned sample_index = get_bits(gb, 4); /* Sample frequency index */ pHeader->SampleRate = avpriv_dca_sample_rates[sample_index]; - unsigned bitrate_index = get_bits(gb, 5); /* Bitrate index */ - pHeader->Bitrate = dca_bit_rates[bitrate_index]; + skip_bits(gb, 5); /* Bitrate index */ skip_bits1(gb); /* Down mix */ skip_bits1(gb); /* Dynamic range */ skip_bits1(gb); /* Time stamp */ diff --git a/decoder/LAVAudio/parser/dts.h b/decoder/LAVAudio/parser/dts.h index 3cb510ed..a3feac38 100644 --- a/decoder/LAVAudio/parser/dts.h +++ b/decoder/LAVAudio/parser/dts.h @@ -44,7 +44,6 @@ struct DTSHeader { unsigned FrameSize; unsigned ChannelLayout; unsigned SampleRate; - unsigned Bitrate; unsigned LFE; // Extensions |