commit 76824fb52cc307efc68674104e3711df100ff71b
Author: Mark Spieth <mspieth@digivation.com.au>
Date: Tue Apr 27 07:51:51 2010 +1000
smoother vsync with predictive frame skipping
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index 42ad109..575bc50 100644
a
|
b
|
MythPlayer::MythPlayer(bool muted) |
236 | 236 | // Audio and video synchronization stuff |
237 | 237 | videosync(NULL), avsync_delay(0), |
238 | 238 | avsync_adjustment(0), avsync_avg(0), |
| 239 | avsync_predictor(0), avsync_predictor_enabled(false), |
239 | 240 | refreshrate(0), |
240 | 241 | lastsync(false), repeat_delay(0), |
241 | 242 | // Time Code stuff |
… |
… |
void MythPlayer::SetVideoParams(int width, int height, double fps, |
869 | 870 | video_frame_rate = fps; |
870 | 871 | float temp_speed = (play_speed == 0.0f) ? |
871 | 872 | audio.GetStretchFactor() : play_speed; |
872 | | frame_interval = (int)(1000000.0f / video_frame_rate / temp_speed); |
| 873 | SetFrameInterval(kScan_Progressive, 1.0 / (video_frame_rate * temp_speed)); |
873 | 874 | } |
874 | 875 | |
875 | 876 | if (videoOutput) |
… |
… |
int MythPlayer::NextCaptionTrack(int mode) |
1598 | 1599 | return NextCaptionTrack(nextmode); |
1599 | 1600 | } |
1600 | 1601 | |
| 1602 | void MythPlayer::SetFrameInterval(FrameScanType scan, double frame_period) |
| 1603 | { |
| 1604 | frame_interval = (int)(1000000.0f * frame_period + 0.5f); |
| 1605 | if (!avsync_predictor_enabled) |
| 1606 | avsync_predictor = 0; |
| 1607 | avsync_predictor_enabled = false; |
| 1608 | |
| 1609 | VERBOSE(VB_PLAYBACK, LOC + QString("SetFrameInterval ps:%1 scan:%2") |
| 1610 | .arg(play_speed).arg(scan) |
| 1611 | ); |
| 1612 | if (play_speed < 1 || play_speed > 2 || refreshrate <= 0) |
| 1613 | return; |
| 1614 | |
| 1615 | avsync_predictor_enabled = ((frame_interval-(frame_interval/200)) < refreshrate); |
| 1616 | } |
| 1617 | |
| 1618 | void MythPlayer::ResetAVSync(void) |
| 1619 | { |
| 1620 | avsync_avg = 0; |
| 1621 | if (!avsync_predictor_enabled || avsync_predictor >= refreshrate) |
| 1622 | avsync_predictor = 0; |
| 1623 | prevtc = 0; |
| 1624 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + "A/V sync reset"); |
| 1625 | } |
| 1626 | |
1601 | 1627 | void MythPlayer::InitAVSync(void) |
1602 | 1628 | { |
1603 | 1629 | videosync->Start(); |
… |
… |
void MythPlayer::InitAVSync(void) |
1620 | 1646 | .arg(refreshrate).arg(frame_interval); |
1621 | 1647 | VERBOSE(VB_PLAYBACK, LOC + msg); |
1622 | 1648 | |
| 1649 | SetFrameInterval(m_scan, 1.0 / (video_frame_rate * play_speed)); |
| 1650 | |
1623 | 1651 | // try to get preferential scheduling, but ignore if we fail to. |
1624 | 1652 | myth_nice(-19); |
1625 | 1653 | } |
1626 | 1654 | } |
1627 | 1655 | |
| 1656 | int64_t MythPlayer::AVSyncGetAudiotime(void) |
| 1657 | { |
| 1658 | int64_t currentaudiotime = 0; |
| 1659 | if (normal_speed) |
| 1660 | { |
| 1661 | currentaudiotime = audio.GetAudioTime(); |
| 1662 | } |
| 1663 | return currentaudiotime; |
| 1664 | } |
| 1665 | |
1628 | 1666 | #define MAXDIVERGE 3.0f |
1629 | 1667 | #define DIVERGELIMIT 30.0f |
1630 | 1668 | void MythPlayer::AVSync(bool limit_delay) |
1631 | 1669 | { |
1632 | 1670 | float diverge = 0.0f; |
1633 | 1671 | int frameDelay = m_double_framerate ? frame_interval / 2 : frame_interval; |
| 1672 | int vsync_delay_clock = 0; |
| 1673 | int64_t currentaudiotime = 0; |
| 1674 | |
1634 | 1675 | // attempt to reduce fps for standalone PIP |
1635 | 1676 | if (player_ctx->IsPIP() && framesPlayed % 2) |
1636 | 1677 | { |
… |
… |
void MythPlayer::AVSync(bool limit_delay) |
1665 | 1706 | if (kScan_Detect == m_scan || kScan_Ignore == m_scan) |
1666 | 1707 | ps = kScan_Progressive; |
1667 | 1708 | |
| 1709 | bool dropframe = false; |
| 1710 | QString dbg; |
| 1711 | |
| 1712 | if (avsync_predictor_enabled) // && !prebuffering) |
| 1713 | { |
| 1714 | avsync_predictor += frame_interval; |
| 1715 | if (avsync_predictor >= refreshrate) |
| 1716 | { |
| 1717 | int refreshperiodsinframe = avsync_predictor/refreshrate; |
| 1718 | avsync_predictor -= refreshrate * refreshperiodsinframe; |
| 1719 | } |
| 1720 | else |
| 1721 | { |
| 1722 | dropframe = true; |
| 1723 | dbg = "A/V predict drop frame, "; |
| 1724 | } |
| 1725 | } |
| 1726 | |
1668 | 1727 | if (diverge < -MAXDIVERGE) |
1669 | 1728 | { |
| 1729 | dropframe = true; |
1670 | 1730 | // If video is way behind of audio, adjust for it... |
1671 | | QString dbg = QString("Video is %1 frames behind audio (too slow), ") |
| 1731 | dbg = QString("Video is %1 frames behind audio (too slow), ") |
1672 | 1732 | .arg(-diverge); |
| 1733 | } |
1673 | 1734 | |
| 1735 | if (dropframe) |
| 1736 | { |
1674 | 1737 | // Reset A/V Sync |
1675 | 1738 | lastsync = true; |
1676 | 1739 | |
| 1740 | currentaudiotime = AVSyncGetAudiotime(); |
| 1741 | |
1677 | 1742 | if (buffer && !using_null_videoout && |
1678 | 1743 | videoOutput->hasHWAcceleration() && |
1679 | 1744 | !videoOutput->IsSyncLocked()) |
… |
… |
void MythPlayer::AVSync(bool limit_delay) |
1698 | 1763 | if (buffer) |
1699 | 1764 | videoOutput->PrepareFrame(buffer, ps, osd); |
1700 | 1765 | |
1701 | | VERBOSE(VB_PLAYBACK|VB_TIMESTAMP, QString("AVSync waitforframe %1 %2") |
| 1766 | VERBOSE(VB_PLAYBACK|VB_TIMESTAMP, LOC + QString("AVSync waitforframe %1 %2") |
1702 | 1767 | .arg(avsync_adjustment).arg(m_double_framerate)); |
1703 | | videosync->WaitForFrame(frameDelay + avsync_adjustment + repeat_delay); |
1704 | | VERBOSE(VB_PLAYBACK|VB_TIMESTAMP, "AVSync show"); |
| 1768 | vsync_delay_clock = videosync->WaitForFrame(frameDelay + avsync_adjustment + repeat_delay); |
| 1769 | currentaudiotime = AVSyncGetAudiotime(); |
| 1770 | VERBOSE(VB_PLAYBACK|VB_TIMESTAMP, LOC + "AVSync show"); |
1705 | 1771 | videoOutput->Show(ps); |
1706 | 1772 | |
1707 | 1773 | if (videoOutput->IsErrored()) |
… |
… |
void MythPlayer::AVSync(bool limit_delay) |
1730 | 1796 | videoOutput->PrepareFrame(buffer, ps, osd); |
1731 | 1797 | |
1732 | 1798 | // Display the second field |
1733 | | videosync->WaitForFrame(frameDelay + avsync_adjustment); |
| 1799 | //videosync->AdvanceTrigger(); |
| 1800 | vsync_delay_clock = videosync->WaitForFrame(frameDelay + avsync_adjustment); |
1734 | 1801 | videoOutput->Show(ps); |
1735 | 1802 | } |
1736 | 1803 | |
1737 | 1804 | repeat_delay = frame_interval * buffer->repeat_pict * 0.5; |
1738 | 1805 | |
1739 | 1806 | if (repeat_delay) |
1740 | | VERBOSE(VB_TIMESTAMP, QString("A/V repeat_pict, adding %1 repeat " |
| 1807 | VERBOSE(VB_TIMESTAMP, LOC + QString("A/V repeat_pict, adding %1 repeat " |
1741 | 1808 | "delay").arg(repeat_delay)); |
1742 | 1809 | } |
1743 | 1810 | else |
1744 | 1811 | { |
1745 | | videosync->WaitForFrame(frameDelay); |
| 1812 | vsync_delay_clock = videosync->WaitForFrame(frameDelay); |
| 1813 | currentaudiotime = AVSyncGetAudiotime(); |
1746 | 1814 | } |
1747 | 1815 | |
1748 | 1816 | if (output_jmeter) |
1749 | | output_jmeter->RecordCycleTime(); |
| 1817 | { |
| 1818 | if (output_jmeter->RecordCycleTime()) |
| 1819 | { |
| 1820 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + QString("A/V avsync_delay: %1, " |
| 1821 | "avsync_avg: %2") |
| 1822 | .arg(avsync_delay / 1000).arg(avsync_avg / 1000) |
| 1823 | ); |
| 1824 | } |
| 1825 | } |
1750 | 1826 | |
1751 | 1827 | avsync_adjustment = 0; |
1752 | 1828 | |
… |
… |
void MythPlayer::AVSync(bool limit_delay) |
1754 | 1830 | { |
1755 | 1831 | // If audio is way behind of video, adjust for it... |
1756 | 1832 | // by cutting the frame rate in half for the length of this frame |
1757 | | avsync_adjustment = refreshrate; |
| 1833 | //avsync_adjustment = refreshrate; |
| 1834 | avsync_adjustment = frame_interval; |
1758 | 1835 | lastsync = true; |
1759 | 1836 | VERBOSE(VB_PLAYBACK, LOC + |
1760 | 1837 | QString("Video is %1 frames ahead of audio,\n" |
… |
… |
void MythPlayer::AVSync(bool limit_delay) |
1764 | 1841 | if (audio.HasAudioOut() && normal_speed) |
1765 | 1842 | { |
1766 | 1843 | int64_t currentaudiotime = audio.GetAudioTime(); |
1767 | | VERBOSE(VB_TIMESTAMP, QString( |
| 1844 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + QString( |
1768 | 1845 | "A/V timecodes audio %1 video %2 frameinterval %3 " |
1769 | | "avdel %4 avg %5 tcoffset %6") |
| 1846 | "avdel %4 avg %5 tcoffset %6" |
| 1847 | " avp %7 avpen %8" |
| 1848 | " avdc %9" |
| 1849 | ) |
1770 | 1850 | .arg(currentaudiotime) |
1771 | 1851 | .arg(buffer->timecode) |
1772 | 1852 | .arg(frame_interval) |
1773 | | .arg(buffer->timecode - currentaudiotime) |
| 1853 | .arg(buffer->timecode - currentaudiotime - (int)(vsync_delay_clock*audio.GetStretchFactor()+500)/1000) |
1774 | 1854 | .arg(avsync_avg) |
1775 | 1855 | .arg(tc_wrap[TC_AUDIO]) |
| 1856 | .arg(avsync_predictor) |
| 1857 | .arg(avsync_predictor_enabled) |
| 1858 | .arg(vsync_delay_clock) |
1776 | 1859 | ); |
1777 | 1860 | if (currentaudiotime != 0 && buffer->timecode != 0) |
1778 | 1861 | { // currentaudiotime == 0 after a seek |
1779 | 1862 | // The time at the start of this frame (ie, now) is given by |
1780 | 1863 | // last->timecode |
1781 | | int delta = (int)((buffer->timecode - prevtc)/play_speed) - (frame_interval / 1000); |
1782 | | prevtc = buffer->timecode; |
1783 | | //cerr << delta << " "; |
1784 | | |
1785 | | // If the timecode is off by a frame (dropped frame) wait to sync |
1786 | | if (delta > (int) frame_interval / 1200 && |
1787 | | delta < (int) frame_interval / 1000 * 3 && |
1788 | | prevrp == 0) |
| 1864 | if (prevtc != 0) |
1789 | 1865 | { |
1790 | | // wait an extra frame interval |
1791 | | avsync_adjustment += frame_interval; |
| 1866 | int delta = (int)((buffer->timecode - prevtc)/play_speed) - (frame_interval / 1000); |
| 1867 | // If the timecode is off by a frame (dropped frame) wait to sync |
| 1868 | if (delta > (int) frame_interval / 1200 && |
| 1869 | delta < (int) frame_interval / 1000 * 3 && |
| 1870 | prevrp == 0) |
| 1871 | { |
| 1872 | // wait an extra frame interval |
| 1873 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + QString("A/V delay %1").arg(delta)); |
| 1874 | avsync_adjustment += frame_interval; |
| 1875 | //videosync->AdvanceTrigger(); |
| 1876 | //if (m_double_framerate) |
| 1877 | // videosync->AdvanceTrigger(); |
| 1878 | } |
1792 | 1879 | } |
| 1880 | prevtc = buffer->timecode; |
1793 | 1881 | prevrp = buffer->repeat_pict; |
1794 | 1882 | |
1795 | | avsync_delay = (buffer->timecode - currentaudiotime) * 1000;//usec |
| 1883 | avsync_delay = (buffer->timecode - currentaudiotime) * 1000 - (int)(vsync_delay_clock*audio.GetStretchFactor()); //usec |
1796 | 1884 | // prevents major jitter when pts resets during dvd title |
1797 | 1885 | if (avsync_delay > 2000000 && limit_delay) |
1798 | 1886 | avsync_delay = 90000; |
1799 | 1887 | avsync_avg = (avsync_delay + (avsync_avg * 3)) / 4; |
1800 | 1888 | |
| 1889 | int avsync_used = avsync_avg; |
| 1890 | if (labs(avsync_used) > labs(avsync_delay)) |
| 1891 | avsync_used = avsync_delay; |
| 1892 | |
1801 | 1893 | /* If the audio time codes and video diverge, shift |
1802 | 1894 | the video by one interlaced field (1/2 frame) */ |
1803 | 1895 | if (!lastsync) |
1804 | 1896 | { |
1805 | | if (avsync_avg > frame_interval * 3 / 2) |
| 1897 | if (avsync_used > refreshrate) |
1806 | 1898 | { |
1807 | 1899 | avsync_adjustment += refreshrate; |
1808 | | lastsync = true; |
| 1900 | //lastsync = true; |
| 1901 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + "A/V avg high extend"); |
1809 | 1902 | } |
1810 | | else if (avsync_avg < 0 - frame_interval * 3 / 2) |
| 1903 | else if (avsync_used < 0 - refreshrate) |
1811 | 1904 | { |
1812 | 1905 | avsync_adjustment -= refreshrate; |
1813 | | lastsync = true; |
| 1906 | //lastsync = true; |
| 1907 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + "A/V avg high skip"); |
1814 | 1908 | } |
1815 | 1909 | } |
1816 | 1910 | else |
… |
… |
void MythPlayer::AVSync(bool limit_delay) |
1818 | 1912 | } |
1819 | 1913 | else |
1820 | 1914 | { |
1821 | | avsync_avg = 0; |
| 1915 | ResetAVSync(); |
1822 | 1916 | } |
1823 | 1917 | } |
| 1918 | else |
| 1919 | { |
| 1920 | VERBOSE(VB_PLAYBACK+VB_TIMESTAMP, LOC + QString("A/V no sync proc ns:%1").arg(normal_speed)); |
| 1921 | } |
1824 | 1922 | } |
1825 | 1923 | |
1826 | 1924 | void MythPlayer::DisplayPauseFrame(void) |
… |
… |
void MythPlayer::ChangeSpeed(void) |
3066 | 3164 | } |
3067 | 3165 | |
3068 | 3166 | float temp_speed = (play_speed == 0.0) ? audio.GetStretchFactor() : play_speed; |
3069 | | frame_interval = (int) (1000000.0f * ffrew_skip / video_frame_rate / |
3070 | | temp_speed); |
| 3167 | SetFrameInterval(m_scan, ffrew_skip / (video_frame_rate * temp_speed)); |
3071 | 3168 | |
3072 | 3169 | VERBOSE(VB_PLAYBACK, LOC + "Play speed: " + |
3073 | 3170 | QString("rate: %1 speed: %2 skip: %3 => new interval %4") |
… |
… |
void MythPlayer::ClearAfterSeek(bool clearvideobuffers) |
3350 | 3447 | commBreakMap.SetTracker(framesPlayed); |
3351 | 3448 | commBreakMap.ResetLastSkip(); |
3352 | 3449 | needNewPauseFrame = true; |
| 3450 | ResetAVSync(); |
3353 | 3451 | } |
3354 | 3452 | |
3355 | 3453 | void MythPlayer::SetPlayerInfo(TV *tv, QWidget *widget, |
diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
index e58bb90..602b8a6 100644
a
|
b
|
class MPUBLIC MythPlayer |
488 | 488 | void WrapTimecode(int64_t &timecode, TCTypes tc_type); |
489 | 489 | void InitAVSync(void); |
490 | 490 | virtual void AVSync(bool limit_delay = false); |
| 491 | void ResetAVSync(void); |
| 492 | int64_t AVSyncGetAudiotime(void); |
| 493 | void SetFrameInterval(FrameScanType scan, double speed); |
491 | 494 | void FallbackDeint(void); |
492 | 495 | void CheckExtraAudioDecode(void); |
493 | 496 | |
… |
… |
class MPUBLIC MythPlayer |
671 | 674 | int avsync_delay; |
672 | 675 | int avsync_adjustment; |
673 | 676 | int avsync_avg; |
| 677 | int avsync_predictor; |
| 678 | bool avsync_predictor_enabled; |
674 | 679 | int refreshrate; |
675 | 680 | bool lastsync; |
676 | 681 | bool decode_extra_audio; |