mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "test old calcPts"

Browse Source 
This reverts commit 88a4587b97.


Origin commit data
------------------
Branch: master
Commit: 1c89a11f5e
Author: max_10 <max_10@gmx.de>
Date: 2014-11-24 (Mon, 24 Nov 2014)



------------------
This commit was generated by Migit
This commit is contained in:
max_10
2014-11-24 11:07:48 +01:00
parent 2341326352
commit 908ce0a6d3
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libeplayer3/input.cpp
View File

@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#define ENABLE_LOGGING 1 #define ENABLE_LOGGING 0
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -58,43 +58,21 @@ Input::~Input()
{ {
} }
#if 1
int64_t Input::calcPts(AVStream * stream, int64_t pts)
{
if (!stream) {
return INVALID_PTS_VALUE;
}
if (pts == AV_NOPTS_VALUE)
pts = INVALID_PTS_VALUE;
else if (avfc->start_time == AV_NOPTS_VALUE)
pts = 90000.0 * (double) pts * av_q2d(stream->time_base);
else
pts = 90000.0 * (double) pts * av_q2d(stream->time_base) - 90000.0 * avfc->start_time / AV_TIME_BASE;
if (pts & 0x8000000000000000ull)
pts = INVALID_PTS_VALUE;
return pts;
}
#else
int64_t Input::calcPts(AVStream * stream, int64_t pts) int64_t Input::calcPts(AVStream * stream, int64_t pts)
{ {
if (pts == AV_NOPTS_VALUE) if (pts == AV_NOPTS_VALUE)
return INVALID_PTS_VALUE; return INVALID_PTS_VALUE;
pts = av_rescale(90000ll * stream->time_base.num, pts, stream->time_base.den); pts = av_rescale(90000ll * stream->time_base.num, pts, stream->time_base.den);
#if 0
if (avfc->start_time != AV_NOPTS_VALUE) if (avfc->start_time != AV_NOPTS_VALUE)
pts -= av_rescale(90000ll, avfc->start_time, AV_TIME_BASE); pts -= av_rescale(90000ll, avfc->start_time, AV_TIME_BASE);
#endif
if (pts < 0) if (pts < 0)
return INVALID_PTS_VALUE; return INVALID_PTS_VALUE;
if (pts & 0x8000000000000000ull)
pts = INVALID_PTS_VALUE;
return pts; return pts;
} }
#endif
// from neutrino-mp/lib/libdvbsubtitle/dvbsub.cpp // from neutrino-mp/lib/libdvbsubtitle/dvbsub.cpp
extern void dvbsub_write(AVSubtitle *, int64_t); extern void dvbsub_write(AVSubtitle *, int64_t);