forked from xbmc/xbmc
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e4d37ae
commit ce5d853
Showing
8 changed files
with
268 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
166 changes: 166 additions & 0 deletions
166
xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxStreamSSIF.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| /* | ||
| * Copyright (C) 2005-2013 Team XBMC | ||
| * http://xbmc.org | ||
| * | ||
| * This Program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This Program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with XBMC; see the file COPYING. If not, see | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #include "DVDDemuxStreamSSIF.h" | ||
| #include "DVDClock.h" | ||
| #include "DVDDemuxUtils.h" | ||
| #include "utils/log.h" | ||
|
|
||
| //#define DEBUG_VERBOSE | ||
|
|
||
| DemuxPacket* CDVDDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) | ||
| { | ||
| if (srcPkt->iStreamId != m_h264StreamId && | ||
| srcPkt->iStreamId != m_mvcStreamId) | ||
| return srcPkt; | ||
|
|
||
| DemuxPacket* newpkt = NULL; | ||
| newpkt = CDVDDemuxUtils::AllocateDemuxPacket(srcPkt->iSize); | ||
| newpkt->iSize = srcPkt->iSize; | ||
|
|
||
| newpkt->pts = srcPkt->pts; | ||
| newpkt->dts = srcPkt->dts; | ||
| newpkt->duration = srcPkt->duration; | ||
| newpkt->iGroupId = srcPkt->iGroupId; | ||
| newpkt->iStreamId = srcPkt->iStreamId; | ||
| memcpy(newpkt->pData, srcPkt->pData, srcPkt->iSize); | ||
|
|
||
| CDVDDemuxUtils::FreeDemuxPacket(srcPkt); | ||
| srcPkt = NULL; | ||
|
|
||
| if (newpkt->iStreamId == m_h264StreamId) | ||
| m_H264queue.push(newpkt); | ||
| else if (newpkt->iStreamId == m_mvcStreamId) | ||
| m_MVCqueue.push(newpkt); | ||
|
|
||
| return GetMVCPacket(); | ||
| } | ||
|
|
||
| void CDVDDemuxStreamSSIF::Flush() | ||
| { | ||
| while (!m_H264queue.empty()) | ||
| { | ||
| CDVDDemuxUtils::FreeDemuxPacket(m_H264queue.front()); | ||
| m_H264queue.pop(); | ||
| } | ||
| while (!m_MVCqueue.empty()) | ||
| { | ||
| CDVDDemuxUtils::FreeDemuxPacket(m_MVCqueue.front()); | ||
| m_MVCqueue.pop(); | ||
| } | ||
| } | ||
|
|
||
| DemuxPacket* CDVDDemuxStreamSSIF::MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt) | ||
| { | ||
| DemuxPacket* newpkt = NULL; | ||
| newpkt = CDVDDemuxUtils::AllocateDemuxPacket(srcPkt->iSize + appendPkt->iSize); | ||
| newpkt->iSize = srcPkt->iSize + appendPkt->iSize; | ||
|
|
||
| newpkt->pts = srcPkt->pts; | ||
| newpkt->dts = srcPkt->dts; | ||
| newpkt->duration = srcPkt->duration; | ||
| newpkt->iGroupId = srcPkt->iGroupId; | ||
| newpkt->iStreamId = srcPkt->iStreamId; | ||
| memcpy(newpkt->pData, srcPkt->pData, srcPkt->iSize); | ||
| memcpy(newpkt->pData + srcPkt->iSize, appendPkt->pData, appendPkt->iSize); | ||
|
|
||
| CDVDDemuxUtils::FreeDemuxPacket(srcPkt); | ||
| srcPkt = NULL; | ||
| CDVDDemuxUtils::FreeDemuxPacket(appendPkt); | ||
| appendPkt = NULL; | ||
|
|
||
| return newpkt; | ||
| } | ||
|
|
||
| DemuxPacket* CDVDDemuxStreamSSIF::GetMVCPacket() | ||
| { | ||
| // Here, we recreate a h264 MVC packet from the base one + buffered MVC NALU's | ||
| while (!m_H264queue.empty() && !m_MVCqueue.empty()) | ||
| { | ||
| DemuxPacket* h264pkt = m_H264queue.front(); | ||
| double tsH264 = (h264pkt->dts != DVD_NOPTS_VALUE ? h264pkt->dts : h264pkt->pts); | ||
| DemuxPacket* mvcpkt = m_MVCqueue.front(); | ||
| double tsMVC = (mvcpkt->dts != DVD_NOPTS_VALUE ? mvcpkt->dts : mvcpkt->pts); | ||
|
|
||
| if (tsH264 == tsMVC) | ||
| { | ||
| m_H264queue.pop(); | ||
| m_MVCqueue.pop(); | ||
|
|
||
| while (!m_H264queue.empty()) | ||
| { | ||
| DemuxPacket* pkt = m_H264queue.front(); | ||
| double ts = (pkt->dts != DVD_NOPTS_VALUE ? pkt->dts : pkt->pts); | ||
| if (ts == DVD_NOPTS_VALUE) | ||
| { | ||
| #if defined(DEBUG_VERBOSE) | ||
| CLog::Log(LOGDEBUG, ">>> MVC merge h264 fragment: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", h264pkt->iSize, pkt->iSize, h264pkt->pts*1e-6, pkt->pts*1e-6, h264pkt->dts*1e-6, pkt->dts*1e-6); | ||
| #endif | ||
| h264pkt = MergePacket(h264pkt, pkt); | ||
| m_H264queue.pop(); | ||
| } | ||
| else | ||
| break; | ||
| } | ||
| while (!m_MVCqueue.empty()) | ||
| { | ||
| DemuxPacket* pkt = m_MVCqueue.front(); | ||
| double ts = (pkt->dts != DVD_NOPTS_VALUE ? pkt->dts : pkt->pts); | ||
| if (ts == DVD_NOPTS_VALUE) | ||
| { | ||
| #if defined(DEBUG_VERBOSE) | ||
| CLog::Log(LOGDEBUG, ">>> MVC merge mvc fragment: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", mvcpkt->iSize, pkt->iSize, mvcpkt->pts*1e-6, pkt->pts*1e-6, mvcpkt->dts*1e-6, pkt->dts*1e-6); | ||
| #endif | ||
| mvcpkt = MergePacket(mvcpkt, pkt); | ||
| m_MVCqueue.pop(); | ||
| } | ||
| else | ||
| break; | ||
| } | ||
|
|
||
| #if defined(DEBUG_VERBOSE) | ||
| CLog::Log(LOGDEBUG, ">>> MVC merge packet: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", h264pkt->iSize, mvcpkt->iSize, h264pkt->pts*1e-6, mvcpkt->pts*1e-6, h264pkt->dts*1e-6, mvcpkt->dts*1e-6); | ||
| #endif | ||
| return MergePacket(h264pkt, mvcpkt); | ||
| } | ||
| else if (tsH264 > tsMVC) | ||
| { | ||
| #if defined(DEBUG_VERBOSE) | ||
| CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvcpkt->iSize, mvcpkt->pts*1e-6, mvcpkt->dts*1e-6); | ||
| #endif | ||
| CDVDDemuxUtils::FreeDemuxPacket(mvcpkt); | ||
| m_MVCqueue.pop(); | ||
| } | ||
| else | ||
| { | ||
| #if defined(DEBUG_VERBOSE) | ||
| CLog::Log(LOGDEBUG, ">>> MVC discard h264: %6d, pts(%.3f) dts(%.3f)", h264pkt->iSize, h264pkt->pts*1e-6, h264pkt->dts*1e-6); | ||
| #endif | ||
| CDVDDemuxUtils::FreeDemuxPacket(h264pkt); | ||
| m_H264queue.pop(); | ||
| } | ||
| } | ||
|
|
||
| #if defined(DEBUG_VERBOSE) | ||
| CLog::Log(LOGDEBUG, ">>> MVC waiting. MVC(%d) H264(%d)", m_MVCqueue.size(), m_H264queue.size()); | ||
| #endif | ||
|
|
||
| return CDVDDemuxUtils::AllocateDemuxPacket(0); | ||
| } |
Oops, something went wrong.