Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 5 files). Show all
Unified · Split
| @@ -76,20 +76,26 @@ static int32_t CreatePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, cons · 75 unmodified lines | ||
| 76 | 76 | pPicBuf->ppPic = (PPicture*)WelsMalloc (kiSize * sizeof (PPicture), "PPicture*"); |
| 77 | 77 | |
| 78 | 78 | if (NULL == pPicBuf->ppPic) { |
| 79 | + pPicBuf->iCapacity = 0; | |
| 80 | + DestroyPicBuff (&pPicBuf); | |
| 79 | 81 | return 1; |
| 80 | 82 | } |
| 83 | + | |
| 81 | 84 | for (iPicIdx = 0; iPicIdx < kiSize; ++ iPicIdx) { |
| 82 | 85 | PPicture pPic = AllocPicture (pCtx, kiPicWidth, kiPicHeight); |
| 83 | 86 | if (NULL == pPic) { |
| 87 | + // init capacity first for free memory | |
| 88 | + pPicBuf->iCapacity = iPicIdx; | |
| 89 | + DestroyPicBuff (&pPicBuf); | |
| 84 | 90 | return 1; |
| 85 | 91 | } |
| 86 | 92 | pPicBuf->ppPic[iPicIdx] = pPic; |
| 87 | 93 | } |
| 88 | 94 | |
| 89 | − // initialize context in queue | |
| 95 | +// initialize context in queue | |
| 90 | 96 | pPicBuf->iCapacity = kiSize; |
| 91 | 97 | pPicBuf->iCurrentIdx = 0; |
| 92 | − *ppPicBuf = pPicBuf; | |
| 98 | + * ppPicBuf = pPicBuf; | |
| 93 | 99 | |
| 94 | 100 | return 0; |
| 95 | 101 | } |
| @@ -112,33 +118,39 @@ static int32_t IncreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 16 unmodified lines | ||
| 112 | 118 | pPicNewBuf->ppPic = (PPicture*)WelsMalloc (kiNewSize * sizeof (PPicture), "PPicture*"); |
| 113 | 119 | |
| 114 | 120 | if (NULL == pPicNewBuf->ppPic) { |
| 121 | + pPicNewBuf->iCapacity = 0; | |
| 122 | + DestroyPicBuff (&pPicNewBuf); | |
| 115 | 123 | return 1; |
| 116 | 124 | } |
| 117 | − // copy old PicBuf to new PicBuf | |
| 118 | − memcpy (pPicNewBuf->ppPic, pPicOldBuf->ppPic, kiOldSize * sizeof (PPicture)); | |
| 119 | − | |
| 120 | 125 | |
| 121 | 126 | // increase new PicBuf |
| 122 | 127 | for (iPicIdx = kiOldSize; iPicIdx < kiNewSize; ++ iPicIdx) { |
| 123 | 128 | PPicture pPic = AllocPicture (pCtx, kiPicWidth, kiPicHeight); |
| 124 | 129 | if (NULL == pPic) { |
| 130 | + // Set maximum capacity as the new malloc memory at the tail | |
| 131 | + pPicNewBuf->iCapacity = iPicIdx; | |
| 132 | + DestroyPicBuff (&pPicNewBuf); | |
| 125 | 133 | return 1; |
| 126 | 134 | } |
| 127 | 135 | pPicNewBuf->ppPic[iPicIdx] = pPic; |
| 128 | 136 | } |
| 129 | − // initialize context in queue | |
| 137 | + | |
| 138 | + // copy old PicBuf to new PicBuf | |
| 139 | + memcpy (pPicNewBuf->ppPic, pPicOldBuf->ppPic, kiOldSize * sizeof (PPicture)); | |
| 140 | + | |
| 141 | +// initialize context in queue | |
| 130 | 142 | pPicNewBuf->iCapacity = kiNewSize; |
| 131 | 143 | pPicNewBuf->iCurrentIdx = pPicOldBuf->iCurrentIdx; |
| 132 | − *ppPicBuf = pPicNewBuf; | |
| 133 | − | |
| 134 | − for(int32_t i = 0; i < pPicNewBuf->iCapacity; i++) { | |
| 144 | + * ppPicBuf = pPicNewBuf; | |
| 145 | + | |
| 146 | + for (int32_t i = 0; i < pPicNewBuf->iCapacity; i++) { | |
| 135 | 147 | pPicNewBuf->ppPic[i]->bUsedAsRef = false; |
| 136 | 148 | pPicNewBuf->ppPic[i]->bIsLongRef = false; |
| 137 | 149 | pPicNewBuf->ppPic[i]->uiRefCount = 0; |
| 138 | 150 | pPicNewBuf->ppPic[i]->bAvailableFlag = true; |
| 139 | 151 | pPicNewBuf->ppPic[i]->bIsComplete = false; |
| 140 | 152 | } |
| 141 | − // remove old PicBuf | |
| 153 | +// remove old PicBuf | |
| 142 | 154 | if (pPicOldBuf->ppPic != NULL) { |
| 143 | 155 | WelsFree (pPicOldBuf->ppPic, "pPicOldBuf->queue"); |
| 144 | 156 | pPicOldBuf->ppPic = NULL; |
| @@ -168,6 +180,8 @@ static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 23 unmodified lines | ||
| 168 | 180 | pPicNewBuf->ppPic = (PPicture*)WelsMalloc (kiNewSize * sizeof (PPicture), "PPicture*"); |
| 169 | 181 | |
| 170 | 182 | if (NULL == pPicNewBuf->ppPic) { |
| 183 | + pPicNewBuf->iCapacity = 0; | |
| 184 | + DestroyPicBuff (&pPicNewBuf); | |
| 171 | 185 | return 1; |
| 172 | 186 | } |
| 173 | 187 | |
| @@ -203,7 +217,7 @@ static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 29 unmodified lines | ||
| 203 | 217 | pPicNewBuf->iCapacity = kiNewSize; |
| 204 | 218 | *ppPicBuf = pPicNewBuf; |
| 205 | 219 | |
| 206 | − for(int32_t i = 0; i < pPicNewBuf->iCapacity; i++) { | |
| 220 | + for (int32_t i = 0; i < pPicNewBuf->iCapacity; i++) { | |
| 207 | 221 | pPicNewBuf->ppPic[i]->bUsedAsRef = false; |
| 208 | 222 | pPicNewBuf->ppPic[i]->bIsLongRef = false; |
| 209 | 223 | pPicNewBuf->ppPic[i]->uiRefCount = 0; |
| @@ -223,7 +237,7 @@ static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 13 unmodified lines | ||
| 223 | 237 | return 0; |
| 224 | 238 | } |
| 225 | 239 | |
| 226 | −static void DestroyPicBuff (PPicBuff* ppPicBuf) { | |
| 240 | +void DestroyPicBuff (PPicBuff* ppPicBuf) { | |
| 227 | 241 | PPicBuff pPicBuf = NULL; |
| 228 | 242 | |
| 229 | 243 | if (NULL == ppPicBuf || NULL == *ppPicBuf) |