Enable handling of bitstreams whose frame width and height are not 64-divisible and come with padding (#47)

zhang-shizhao · U1X6WK · commit 5de7ff112ac1 · 2023-07-14T10:52:30.000+08:00
diff --git a/src/360SCVP/360SCVPHevcTilestream.cpp b/src/360SCVP/360SCVPHevcTilestream.cpp
@@ -31,6 +31,7 @@
 #include "360SCVPHevcEncHdr.h"
 #include "360SCVPTiledstreamAPI.h"
 #include "360SCVPLog.h"
+#define ALIGN64(X) ((uint32_t)(((uint32_t)(X))+63) & (uint32_t)(~ (uint32_t)63))
 
 int32_t hevc_import_ffextradata(hevc_specialInfo* pSpecialInfo, HEVCState* hevc, uint32_t *pSize, int32_t *spsCnt, int32_t *audCnt, int32_t bParse)
 {
@@ -281,8 +282,8 @@ int32_t parse_tiles_info(hevc_gen_tiledstream* pGenTilesStream)
             if(nalsize[SEQ_PARAM_SET])
             {
                 HEVC_SPS *sps = &pSliceCur->hevcSlice->sps[pSliceCur->hevcSlice->last_parsed_sps_id];
-                pSliceCur->width = sps->width;
-                pSliceCur->height = sps->height;
+                pSliceCur->width = ALIGN64(sps->width);
+                pSliceCur->height = ALIGN64(sps->height);
             }
 /*
             if(pSliceCur->width != (pGenTilesStream->frameWidth / tilesWidthCount)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "360SCVPHevcEncHdr.h"`
`32`	`32`	`#include "360SCVPTiledstreamAPI.h"`
`33`	`33`	`#include "360SCVPLog.h"`
	`34`	`+#define ALIGN64(X) ((uint32_t)(((uint32_t)(X))+63) & (uint32_t)(~ (uint32_t)63))`
`34`	`35`
`35`	`36`	`int32_t hevc_import_ffextradata(hevc_specialInfo* pSpecialInfo, HEVCState* hevc, uint32_t pSize, int32_t spsCnt, int32_t *audCnt, int32_t bParse)`
`36`	`37`	`{`
`@@ -281,8 +282,8 @@ int32_t parse_tiles_info(hevc_gen_tiledstream* pGenTilesStream)`
`281`	`282`	`if(nalsize[SEQ_PARAM_SET])`
`282`	`283`	`{`
`283`	`284`	`HEVC_SPS *sps = &pSliceCur->hevcSlice->sps[pSliceCur->hevcSlice->last_parsed_sps_id];`
`284`		`- pSliceCur->width = sps->width;`
`285`		`- pSliceCur->height = sps->height;`
	`285`	`+ pSliceCur->width = ALIGN64(sps->width);`
	`286`	`+ pSliceCur->height = ALIGN64(sps->height);`
`286`	`287`	`}`
`287`	`288`	`/*`
`288`	`289`	`if(pSliceCur->width != (pGenTilesStream->frameWidth / tilesWidthCount)`