Skip to content

[WIP] AC3 core passthrough from EAC3 #17

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

Open
KeyserSoze1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] AC3 core passthrough from EAC3 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ CAEStreamParser::CAEStreamParser() :
m_needBytes (0),
m_syncFunc (&CAEStreamParser::DetectType),
m_hasSync (false),
m_detectedEAC3 (false),
m_coreSize (0),
m_dtsBlocks (0),
m_fsize (0),
Expand Down Expand Up @@ -255,10 +256,15 @@ void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize)
/* if the caller wants the packet */
if (buffer)
{
/* if it is dtsHD and we only want the core, just fetch that */
/* if it is dtsHD/eac3 and we only want the core, just fetch that */
unsigned int size = m_fsize;
if (m_info.m_type == CAEStreamInfo::STREAM_TYPE_DTSHD_CORE)
if ((m_info.m_type == CAEStreamInfo::STREAM_TYPE_DTSHD_CORE || m_info.m_type == CAEStreamInfo::STREAM_TYPE_AC3) &&
m_fsize)
{
size = m_coreSize;
m_coreSize = 0;
}


/* make sure the buffer is allocated and big enough */
if (!*buffer || !bufferSize || *bufferSize < size)
Expand All @@ -277,7 +283,6 @@ void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize)
m_bufferSize -= m_fsize;
memmove(m_buffer, m_buffer + m_fsize, m_bufferSize);
m_fsize = 0;
m_coreSize = 0;
}

/* SYNC FUNCTIONS */
Expand Down Expand Up @@ -394,10 +399,12 @@ unsigned int CAEStreamParser::SyncAC3(uint8_t *data, unsigned int size)

m_fsize = framesize << 1;
m_info.m_sampleRate = AC3FSCod[fscod];
m_coreSize = m_fsize;

/* dont do extensive testing if we have not lost sync */
/* this may be the main stream of EAC3 */
if (m_info.m_type == CAEStreamInfo::STREAM_TYPE_EAC3 && skip == 0)
if ((m_info.m_type == CAEStreamInfo::STREAM_TYPE_EAC3 ||
(m_info.m_type == CAEStreamInfo::STREAM_TYPE_AC3 && m_detectedEAC3 && m_coreOnly)) && skip == 0)
{
m_fsizeMain = m_fsize;
m_fsize = 0;
Expand Down Expand Up @@ -464,6 +471,11 @@ unsigned int CAEStreamParser::SyncAC3(uint8_t *data, unsigned int size)
m_fsize += m_fsizeMain;
}
m_fsizeMain = 0;
m_detectedEAC3 = true;

if (m_coreOnly && m_info.m_type == CAEStreamInfo::STREAM_TYPE_AC3 && m_hasSync && skip == 0 &&
strmtyp == 1)
return 0;

m_info.m_repeat = MAX_EAC3_BLOCKS / blocks;

Expand Down
1 change: 1 addition & 0 deletions xbmc/cores/AudioEngine/Utils/AEStreamInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class CAEStreamParser
unsigned int m_needBytes;
ParseFunc m_syncFunc;
bool m_hasSync;
bool m_detectedEAC3;

unsigned int m_coreSize; /* core size for dtsHD */
unsigned int m_dtsBlocks;
Expand Down
19 changes: 15 additions & 4 deletions xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,26 @@ bool CDVDAudioCodecPassthrough::Open(CDVDStreamInfo &hints, CDVDCodecOptions &op
bool ret = CAEFactory::SupportsRaw(format);

m_parser.SetCoreOnly(false);
if (!ret && hints.codec == AV_CODEC_ID_DTS)
if (!ret && (hints.codec == AV_CODEC_ID_DTS || hints.codec == AV_CODEC_ID_EAC3))
{
format.m_streamInfo.m_type = CAEStreamInfo::STREAM_TYPE_DTSHD_CORE;
if (hints.codec == AV_CODEC_ID_DTS)
format.m_streamInfo.m_type = CAEStreamInfo::STREAM_TYPE_DTSHD_CORE;
else
format.m_streamInfo.m_type = CAEStreamInfo::STREAM_TYPE_AC3;

ret = CAEFactory::SupportsRaw(format);

// only get the dts core from the parser if we don't support dtsHD
// only get the core from the parser if we don't support dtsHD/EAC3
m_parser.SetCoreOnly(true);
}

else if (ret && hints.codec == AV_CODEC_ID_AC3)
{
// check for EAC3 passthrough support. If not enabled then set for core only
AEAudioFormat eac3format = format;
eac3format.m_streamInfo.m_type = CAEStreamInfo::STREAM_TYPE_EAC3;
m_parser.SetCoreOnly(!CAEFactory::SupportsRaw(eac3format));
}

#if defined(TARGET_DARWIN_TVOS)
// tvos doesn't like 44100 dts passthrough even if it generally can do 44100 samplerate
if (hints.codec == AV_CODEC_ID_DTS && hints.samplerate != 48000)
Expand Down
7 changes: 7 additions & 0 deletions xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ bool CDVDPlayerAudio::OpenStream(CDVDStreamInfo &hints)
//if (hints.realtime)
// allowpassthrough = false;

// Handle special case where switching from AC3 -> EAC3 and no passthrough support for EAC3
if (allowpassthrough && m_pAudioCodec &&
m_pAudioCodec->GetFormat().m_streamInfo.m_type == CAEStreamInfo::STREAM_TYPE_AC3 &&
hints.codec == AV_CODEC_ID_EAC3 && m_pAudioCodec->NeedPassthrough() &&
!CSettings::GetInstance().GetBool(CSettings::SETTING_AUDIOOUTPUT_EAC3PASSTHROUGH))
allowpassthrough = false;

CDVDAudioCodec* codec = CDVDFactoryCodec::CreateAudioCodec(hints, allowpassthrough);
if(!codec)
{
Expand Down