Fix crash on multi-thread decoding. (#3736)

tyan0 · web-flow · commit 1debdaecd651 · 2024-04-10T14:26:37.000+08:00
When decoding: https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_1080p_h264.mov in multi-threads, openh264 crashes with segfault. This patch fixes the issue.
diff --git a/codec/decoder/core/src/decoder.cpp b/codec/decoder/core/src/decoder.cpp
@@ -820,8 +820,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
             if (pCtx->bAuReadyFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) {
               if (GetThreadCount (pCtx) <= 1) {
                 ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);
-              } else {
-                pCtx->pAccessUnitList->uiAvailUnitsNum = 1;
               }
             }
           }
@@ -884,8 +882,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
       if (pCtx->bAuReadyFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) {
         if (GetThreadCount (pCtx) <= 1) {
           ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);
-        } else {
-          pCtx->pAccessUnitList->uiAvailUnitsNum = 1;
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -820,8 +820,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in`
`820`	`820`	`if (pCtx->bAuReadyFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) {`
`821`	`821`	`if (GetThreadCount (pCtx) <= 1) {`
`822`	`822`	`ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);`
`823`		`- } else {`
`824`		`- pCtx->pAccessUnitList->uiAvailUnitsNum = 1;`
`825`	`823`	`}`
`826`	`824`	`}`
`827`	`825`	`}`
`@@ -884,8 +882,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in`
`884`	`882`	`if (pCtx->bAuReadyFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) {`
`885`	`883`	`if (GetThreadCount (pCtx) <= 1) {`
`886`	`884`	`ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);`
`887`		`- } else {`
`888`		`- pCtx->pAccessUnitList->uiAvailUnitsNum = 1;`
`889`	`885`	`}`
`890`	`886`	`}`
`891`	`887`	`}`