Merge pull request #4156 from phire/interlaced_panic

VideoInterface: Fix panic alert on interlaced fields.
This commit is contained in:
Scott Mansell 2016-08-29 23:10:55 +12:00 committed by GitHub
commit efac0cf8fe
1 changed files with 4 additions and 2 deletions

View File

@ -678,10 +678,12 @@ static void BeginField(FieldType field)
// has the first line. For the field with the second line, we
// offset the xfb by (-stride_of_one_line) to get the start
// address of the full xfb.
if (field == FieldType::FIELD_ODD && m_VBlankTimingOdd.PRB == m_VBlankTimingEven.PRB + 1)
if (field == FieldType::FIELD_ODD && m_VBlankTimingOdd.PRB == m_VBlankTimingEven.PRB + 1 &&
xfbAddr)
xfbAddr -= fbStride * 2;
if (field == FieldType::FIELD_EVEN && m_VBlankTimingOdd.PRB == m_VBlankTimingEven.PRB - 1)
if (field == FieldType::FIELD_EVEN && m_VBlankTimingOdd.PRB == m_VBlankTimingEven.PRB - 1 &&
xfbAddr)
xfbAddr -= fbStride * 2;
}