Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SoundSourceM4A: Reconfigure decoder after channel config errors #2850

Merged
merged 20 commits into from
Jun 13, 2020
Merged

SoundSourceM4A: Reconfigure decoder after channel config errors #2850

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
abd320e
Add NeAACDecGetVersion to LibFaadLoader
uklotzde May 6, 2020
e4d3bba
Add missing const-qualifiers for methods of LibFaadLoader
uklotzde May 6, 2020
e324776
Log FAAD2 version string after loading the dynamic library
uklotzde May 6, 2020
946e769
Log FAAD2 decoder configuration
uklotzde May 6, 2020
ed6dbf1
FAAD2: Do not set defObjectType to LC
uklotzde May 6, 2020
bfd0746
Enclose FAAD2 types and constants in `faad2` namespace
uklotzde Jun 7, 2020
332c5e2
Replace const with constexpr
uklotzde Jun 7, 2020
862a056
Declare member as const
uklotzde Jun 7, 2020
354db66
Initialize FAAD2 decoder in separate function
uklotzde Jun 7, 2020
5309bab
SoundSourceM4A: Recover from FAAD2 2.9.x channel errors
uklotzde Jun 7, 2020
7c94bff
FAAD2: Reconfigure decoder after channel config errors
uklotzde Jun 7, 2020
b442828
Ignore unsupported file formats in SoundSourceProxyTest
uklotzde Jun 7, 2020
22d4ead
Don't make NeAACDecGetVersion mandatory
daschuer Jun 9, 2020
5b2fcda
CMake: Enable the FAAD2 loader on Linux by default
daschuer Jun 9, 2020
c775f33
Merge pull request #15 from daschuer/faad2
uklotzde Jun 10, 2020
c8f682f
Reorder and add comments
uklotzde Jun 10, 2020
256db1d
Improve code formatting
uklotzde Jun 10, 2020
f3dcc8a
Add comments and a debug assertion about error recovery
uklotzde Jun 10, 2020
8ce43f4
Improve readability by skipping the remaining loop body
uklotzde Jun 10, 2020
7ec1dbf
Add comment about "potentially" discontinuous decoding
uklotzde Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add comment about "potentially" discontinuous decoding
  • Loading branch information
@uklotzde
uklotzde committed Jun 13, 2020
commit 7ec1dbff9ff523e99f8675ee7ae2269589150c7b
4 changes: 4 additions & 0 deletions src/sources/soundsourcem4a.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,10 @@ ReadableSampleFrames SoundSourceM4A::readSampleFramesClamped(
<< decFrameInfo.error
<< m_pFaad->GetErrorMessage(decFrameInfo.error)
<< getUrlString();
// Assumption: All samples from the preceding blocks have been
// decoded and consumed before decoding continues with the new,
// reopened decoder. Otherwise the decoded stream of samples
// might be discontinuous, but we can't do anything about it.
retryAfterReopeningDecoder = reopenDecoder();
daschuer marked this conversation as resolved.
Show resolved Hide resolved
// If reopening the decoder failed retrying the same sample
// block with the same decoder instance will fail again. In
Expand Down