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.

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

Jump to bottom

[videoplayer] [bluray] Fix playback of disc with truehd tracks in menu mode. #14382

Merged
merged 2 commits into from Sep 7, 2018
Merged

[videoplayer] [bluray] Fix playback of disc with truehd tracks in menu mode. #14382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9282a40
[bluray] Fix playback of disc with truehd tracks in nav mode.
ace20022 Sep 1, 2018
4314f6e
[videoplayer] DVDDemuxFFmpeg: Don't try to add streams that are flagg…
ace20022 Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 18 additions & 2 deletions xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
View file
Open in desktop
Expand Up @@ -1394,7 +1394,7 @@ void CDVDDemuxFFmpeg::DisposeStreams()
CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
{
AVStream* pStream = m_pFormatContext->streams[streamIdx];
if (pStream)
if (pStream && pStream->discard != AVDISCARD_ALL)
{
// Video (mp4) from GoPro cameras can have a 'meta' track used for a file repair containing
// 'fdsc' data, this is also called the SOS track.
Expand Down Expand Up @@ -1630,8 +1630,24 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
#ifdef HAVE_LIBBLURAY
if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY))
{
std::static_pointer_cast<CDVDInputStreamBluray>(m_pInput)->GetStreamInfo(pStream->id, stream->language);
stream->dvdNavId = pStream->id;

auto it = std::find_if(m_streams.begin(), m_streams.end(),
[&stream](const std::pair<int, CDemuxStream*>& v)
{return (v.second->dvdNavId == stream->dvdNavId) && (v.second->type == stream->type); });

if (it != m_streams.end())
{
if (stream->codec == AV_CODEC_ID_AC3 && it->second->codec == AV_CODEC_ID_TRUEHD)
CLog::Log(LOGDEBUG, "CDVDDemuxFFmpeg::AddStream - discarding duplicated bluray stream (truehd ac3 core)");
else
CLog::Log(LOGDEBUG, "CDVDDemuxFFmpeg::AddStream - discarding duplicate bluray stream %s", stream->codecName);

pStream->discard = AVDISCARD_ALL;
delete stream;
return nullptr;
}
std::static_pointer_cast<CDVDInputStreamBluray>(m_pInput)->GetStreamInfo(pStream->id, stream->language);
}
#endif
if( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) )
Expand Down