Fix support for interlaced formats with more than 1 byte / pixel
This commit is contained in:
2 files changed
+2
-19
No files matched your search
+2
-2
@@ -593,10 +593,10 @@ void CalypFrame::frameFromBuffer( ClpByte* Buff, int iEndianness )
|
||||
{
|
||||
ratioW = ch > 0 ? d->m_pcPelFormat->log2ChromaWidth : 0;
|
||||
ratioH = ch > 0 ? d->m_pcPelFormat->log2ChromaHeight : 0;
|
||||
step = d->m_pcPelFormat->comp[ch].step_minus1;
|
||||
step = ( d->m_pcPelFormat->comp[ch].step_minus1 ) * bytesPixel;
|
||||
|
||||
pPel = d->m_pppcInputPel[ch][0];
|
||||
pTmpBuff = ppBuff[d->m_pcPelFormat->comp[ch].plane] + ( d->m_pcPelFormat->comp[ch].offset_plus1 - 1 );
|
||||
pTmpBuff = ppBuff[d->m_pcPelFormat->comp[ch].plane] + ( d->m_pcPelFormat->comp[ch].offset_plus1 - 1 ) * bytesPixel;
|
||||
|
||||
for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ); i++ )
|
||||
{
|
||||
|
||||
@@ -177,23 +177,6 @@ const std::map<int, CalypPixelFormatDescriptor> g_CalypPixFmtDescriptorsMap = {
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
CLP_BGR24,
|
||||
{
|
||||
"BGR",
|
||||
CLP_COLOR_RGB,
|
||||
3,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_BGR24 ),
|
||||
{
|
||||
{0, 2, 3}, /* R */
|
||||
{0, 2, 2}, /* G */
|
||||
{0, 2, 1}, /* B */
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
CLP_RGBA32,
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user