FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #558 from LaurensVoerman/submit-ffmpeg3.2

Browse Source 
resolve av sync failure with ffmpeg 3.2 and up
This commit is contained in:
OpenSceneGraph git repository 2018-06-19 11:50:38 +01:00 committed by GitHub
commit 12db2f8011
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgPlugins/ffmpeg/FFmpegClocks.cpp
View File

@ -155,8 +155,7 @@ double FFmpegClocks::videoSynchClock(const AVFrame * const frame, const double t
// Update the video clock to take into account the frame delay // Update the video clock to take into account the frame delay
double frame_delay = time_base; double frame_delay = time_base * (1 + frame->repeat_pict);
frame_delay += frame->repeat_pict * (frame_delay * 0.5);
m_video_clock += frame_delay; m_video_clock += frame_delay;

26
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
View File

@ -180,6 +180,8 @@ void FFmpegDecoderVideo::decodeLoop()
// Publish the frame if we have decoded a complete frame // Publish the frame if we have decoded a complete frame
if (frame_finished) if (frame_finished)
{ {
#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(57,24,102)
//ffmpeg-3.0 and below
AVRational timebase; AVRational timebase;
// Find out the frame pts // Find out the frame pts
if (m_frame->pts != int64_t(AV_NOPTS_VALUE)) if (m_frame->pts != int64_t(AV_NOPTS_VALUE))
@ -207,7 +209,29 @@ void FFmpegDecoderVideo::decodeLoop()
pts *= av_q2d(timebase); pts *= av_q2d(timebase);
const double synched_pts = m_clocks.videoSynchClock(m_frame.get(), av_q2d(timebase), pts); #else
//above ffmpeg-3.0
// Find out the frame pts
if (m_frame->pts != int64_t(AV_NOPTS_VALUE))
{
pts = av_q2d(m_stream->time_base) * m_frame->pts;
}
else if (packet.packet.dts == int64_t(AV_NOPTS_VALUE) &&
m_frame->opaque != 0 &&
*reinterpret_cast<const int64_t*>(m_frame->opaque) != int64_t(AV_NOPTS_VALUE))
{
pts = av_q2d(m_stream->time_base) * *reinterpret_cast<const int64_t*>(m_frame->opaque);
}
else if (packet.packet.dts != int64_t(AV_NOPTS_VALUE))
{
pts = av_q2d(m_stream->time_base) * packet.packet.dts;
}
else
{
pts = 0;
}
#endif
const double synched_pts = m_clocks.videoSynchClock(m_frame.get(), av_q2d(av_inv_q(m_context->framerate)), pts);
const double frame_delay = m_clocks.videoRefreshSchedule(synched_pts); const double frame_delay = m_clocks.videoRefreshSchedule(synched_pts);
publishFrame(frame_delay, m_clocks.audioDisabled()); publishFrame(frame_delay, m_clocks.audioDisabled());