Permalink
Browse files

Merge pull request #4500 from FernetMenta/aefixes

Revert "paplayer: use position based seeks for ffmpeg demuxer"
  • Loading branch information...
2 parents 3b7d501 + 925b021 commit 6dff1d30e09138bba998cbcf1cb34b78220dea13 @jmarshallnz jmarshallnz committed Apr 3, 2014
Showing with 1 addition and 17 deletions.
  1. +1 −14 xbmc/cores/paplayer/DVDPlayerCodec.cpp
  2. +0 −3 xbmc/cores/paplayer/DVDPlayerCodec.h
@@ -24,7 +24,6 @@
#include "cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h"
#include "cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h"
#include "cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h"
#include "cores/dvdplayer/DVDStreamInfo.h"
#include "cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h"
#include "music/tags/TagLoaderTagLib.h"
@@ -61,12 +60,6 @@ void DVDPlayerCodec::SetContentType(const CStdString &strContent)
bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache)
{
- if (!m_dllAvUtil.Load())
- {
- CLog::Log(LOGERROR, "DVDPlayerCodec::Init - failed to load avutil");
- return false;
- }
-
// take precaution if Init()ialized earlier
if (m_bInited)
{
@@ -246,8 +239,6 @@ void DVDPlayerCodec::DeInit()
m_pAudioCodec = NULL;
}
- m_dllAvUtil.Unload();
-
// cleanup format information
m_TotalTime = 0;
m_SampleRate = 0;
@@ -271,11 +262,7 @@ int64_t DVDPlayerCodec::Seek(int64_t iSeekTime)
CDVDDemuxUtils::FreeDemuxPacket(m_pPacket);
m_pPacket = NULL;
- CDVDDemuxFFmpeg *ffmpegDemuxer = dynamic_cast<CDVDDemuxFFmpeg*>(m_pDemuxer);
- if (ffmpegDemuxer)
- ffmpegDemuxer->SeekByte(m_dllAvUtil.av_rescale_rnd(iSeekTime, m_pInputStream->GetLength(), m_TotalTime, AV_ROUND_NEAR_INF));
- else
- m_pDemuxer->SeekTime((int)iSeekTime, false);
+ m_pDemuxer->SeekTime((int)iSeekTime, false);
m_pAudioCodec->Reset();
m_decoded = NULL;
@@ -26,7 +26,6 @@
#include "cores/dvdplayer/DVDDemuxers/DVDDemux.h"
#include "cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h"
#include "cores/dvdplayer/DVDInputStreams/DVDInputStream.h"
-#include "DllAvUtil.h"
class DVDPlayerCodec : public ICodec
{
@@ -64,8 +63,6 @@ class DVDPlayerCodec : public ICodec
CAEChannelInfo m_ChannelInfo;
bool m_bInited;
-
- DllAvUtil m_dllAvUtil;
};
#endif

0 comments on commit 6dff1d3

Please sign in to comment.