TRUE/FALSE has intentionally been left in use for the few platform specific APIs that define these constants themselves and expect them to be used, for consistency.
Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 22 files). Show all
Unified · Split
| @@ -368,56 +368,56 @@ bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeade · 367 unmodified lines | |||
| 368 | 368 | ||
| 369 | //Sub-clause 7.1.4.1.1 temporal_id | 369 | //Sub-clause 7.1.4.1.1 temporal_id |
| 370 | if (pLastNalHdrExt->uiTemporalId != pCurNalHeaderExt->uiTemporalId) { | 370 | if (pLastNalHdrExt->uiTemporalId != pCurNalHeaderExt->uiTemporalId) { |
| 371 | return TRUE; | 371 | return true; |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | // Subclause 7.4.1.2.5 | 374 | // Subclause 7.4.1.2.5 |
| 375 | if (pLastSliceHeader->iRedundantPicCnt < pCurSliceHeader->iRedundantPicCnt) | 375 | if (pLastSliceHeader->iRedundantPicCnt < pCurSliceHeader->iRedundantPicCnt) |
| 376 | return FALSE; | 376 | return false; |
| 377 | else if (pLastSliceHeader->iRedundantPicCnt > pCurSliceHeader->iRedundantPicCnt) | 377 | else if (pLastSliceHeader->iRedundantPicCnt > pCurSliceHeader->iRedundantPicCnt) |
| 378 | return TRUE; | 378 | return true; |
| 379 | 379 | ||
| 380 | // Subclause G7.4.1.2.4 | 380 | // Subclause G7.4.1.2.4 |
| 381 | if (pLastNalHdrExt->uiDependencyId < pCurNalHeaderExt->uiDependencyId) | 381 | if (pLastNalHdrExt->uiDependencyId < pCurNalHeaderExt->uiDependencyId) |
| 382 | return FALSE; | 382 | return false; |
| 383 | else if (pLastNalHdrExt->uiDependencyId > pCurNalHeaderExt->uiDependencyId) | 383 | else if (pLastNalHdrExt->uiDependencyId > pCurNalHeaderExt->uiDependencyId) |
| 384 | return TRUE; | 384 | return true; |
| 385 | if (pLastNalHdrExt->uiQualityId < pCurNalHeaderExt->uiQualityId) | 385 | if (pLastNalHdrExt->uiQualityId < pCurNalHeaderExt->uiQualityId) |
| 386 | return FALSE; | 386 | return false; |
| 387 | else if (pLastNalHdrExt->uiQualityId > pCurNalHeaderExt->uiQualityId) | 387 | else if (pLastNalHdrExt->uiQualityId > pCurNalHeaderExt->uiQualityId) |
| 388 | return TRUE; | 388 | return true; |
| 389 | 389 | ||
| 390 | // Subclause 7.4.1.2.4 | 390 | // Subclause 7.4.1.2.4 |
| 391 | if (pLastSliceHeader->iFrameNum != pCurSliceHeader->iFrameNum) | 391 | if (pLastSliceHeader->iFrameNum != pCurSliceHeader->iFrameNum) |
| 392 | return TRUE; | 392 | return true; |
| 393 | if (pLastSliceHeader->iPpsId != pCurSliceHeader->iPpsId) | 393 | if (pLastSliceHeader->iPpsId != pCurSliceHeader->iPpsId) |
| 394 | return TRUE; | 394 | return true; |
| 395 | if (pLastSliceHeader->bFieldPicFlag != pCurSliceHeader->bFieldPicFlag) | 395 | if (pLastSliceHeader->bFieldPicFlag != pCurSliceHeader->bFieldPicFlag) |
| 396 | return TRUE; | 396 | return true; |
| 397 | if (pLastSliceHeader->bBottomFiledFlag != pCurSliceHeader->bBottomFiledFlag) | 397 | if (pLastSliceHeader->bBottomFiledFlag != pCurSliceHeader->bBottomFiledFlag) |
| 398 | return TRUE; | 398 | return true; |
| 399 | if ((pLastNalHdrExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (pCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc != | 399 | if ((pLastNalHdrExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (pCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc != |
| 400 | NRI_PRI_LOWEST)) | 400 | NRI_PRI_LOWEST)) |
| 401 | return TRUE; | 401 | return true; |
| 402 | if (pLastNalHdrExt->bIdrFlag != pCurNalHeaderExt->bIdrFlag) | 402 | if (pLastNalHdrExt->bIdrFlag != pCurNalHeaderExt->bIdrFlag) |
| 403 | return TRUE; | 403 | return true; |
| 404 | if (pCurNalHeaderExt->bIdrFlag) { | 404 | if (pCurNalHeaderExt->bIdrFlag) { |
| 405 | if (pLastSliceHeader->uiIdrPicId != pCurSliceHeader->uiIdrPicId) | 405 | if (pLastSliceHeader->uiIdrPicId != pCurSliceHeader->uiIdrPicId) |
| 406 | return TRUE; | 406 | return true; |
| 407 | } | 407 | } |
| 408 | if (kpSps->uiPocType == 0) { | 408 | if (kpSps->uiPocType == 0) { |
| 409 | if (pLastSliceHeader->iPicOrderCntLsb != pCurSliceHeader->iPicOrderCntLsb) | 409 | if (pLastSliceHeader->iPicOrderCntLsb != pCurSliceHeader->iPicOrderCntLsb) |
| 410 | return TRUE; | 410 | return true; |
| 411 | if (pLastSliceHeader->iDeltaPicOrderCntBottom != pCurSliceHeader->iDeltaPicOrderCntBottom) | 411 | if (pLastSliceHeader->iDeltaPicOrderCntBottom != pCurSliceHeader->iDeltaPicOrderCntBottom) |
| 412 | return TRUE; | 412 | return true; |
| 413 | } else if (kpSps->uiPocType == 1) { | 413 | } else if (kpSps->uiPocType == 1) { |
| 414 | if (pLastSliceHeader->iDeltaPicOrderCnt[0] != pCurSliceHeader->iDeltaPicOrderCnt[0]) | 414 | if (pLastSliceHeader->iDeltaPicOrderCnt[0] != pCurSliceHeader->iDeltaPicOrderCnt[0]) |
| 415 | return TRUE; | 415 | return true; |
| 416 | if (pLastSliceHeader->iDeltaPicOrderCnt[1] != pCurSliceHeader->iDeltaPicOrderCnt[1]) | 416 | if (pLastSliceHeader->iDeltaPicOrderCnt[1] != pCurSliceHeader->iDeltaPicOrderCnt[1]) |
| 417 | return TRUE; | 417 | return true; |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | return FALSE; | 420 | return false; |
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | 423 | ||
| @@ -429,56 +429,56 @@ bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, · 5 unmodified lines | |||
| 429 | 429 | ||
| 430 | //Sub-clause 7.1.4.1.1 temporal_id | 430 | //Sub-clause 7.1.4.1.1 temporal_id |
| 431 | if (kpLastNalHeaderExt->uiTemporalId != kpCurNalHeaderExt->uiTemporalId) { | 431 | if (kpLastNalHeaderExt->uiTemporalId != kpCurNalHeaderExt->uiTemporalId) { |
| 432 | return TRUE; | 432 | return true; |
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | // Subclause 7.4.1.2.5 | 435 | // Subclause 7.4.1.2.5 |
| 436 | if (kpLastSliceHeader->iRedundantPicCnt < kpCurSliceHeader->iRedundantPicCnt) | 436 | if (kpLastSliceHeader->iRedundantPicCnt < kpCurSliceHeader->iRedundantPicCnt) |
| 437 | return FALSE; | 437 | return false; |
| 438 | else if (kpLastSliceHeader->iRedundantPicCnt > kpCurSliceHeader->iRedundantPicCnt) | 438 | else if (kpLastSliceHeader->iRedundantPicCnt > kpCurSliceHeader->iRedundantPicCnt) |
| 439 | return TRUE; | 439 | return true; |
| 440 | 440 | ||
| 441 | // Subclause G7.4.1.2.4 | 441 | // Subclause G7.4.1.2.4 |
| 442 | if (kpLastNalHeaderExt->uiDependencyId < kpCurNalHeaderExt->uiDependencyId) | 442 | if (kpLastNalHeaderExt->uiDependencyId < kpCurNalHeaderExt->uiDependencyId) |
| 443 | return FALSE; | 443 | return false; |
| 444 | else if (kpLastNalHeaderExt->uiDependencyId > kpCurNalHeaderExt->uiDependencyId) | 444 | else if (kpLastNalHeaderExt->uiDependencyId > kpCurNalHeaderExt->uiDependencyId) |
| 445 | return TRUE; | 445 | return true; |
| 446 | if (kpLastNalHeaderExt->uiQualityId < kpCurNalHeaderExt->uiQualityId) | 446 | if (kpLastNalHeaderExt->uiQualityId < kpCurNalHeaderExt->uiQualityId) |
| 447 | return FALSE; | 447 | return false; |
| 448 | else if (kpLastNalHeaderExt->uiQualityId > kpCurNalHeaderExt->uiQualityId) | 448 | else if (kpLastNalHeaderExt->uiQualityId > kpCurNalHeaderExt->uiQualityId) |
| 449 | return TRUE; | 449 | return true; |
| 450 | 450 | ||
| 451 | // Subclause 7.4.1.2.4 | 451 | // Subclause 7.4.1.2.4 |
| 452 | if (kpLastSliceHeader->iFrameNum != kpCurSliceHeader->iFrameNum) | 452 | if (kpLastSliceHeader->iFrameNum != kpCurSliceHeader->iFrameNum) |
| 453 | return TRUE; | 453 | return true; |
| 454 | if (kpLastSliceHeader->iPpsId != kpCurSliceHeader->iPpsId) | 454 | if (kpLastSliceHeader->iPpsId != kpCurSliceHeader->iPpsId) |
| 455 | return TRUE; | 455 | return true; |
| 456 | if (kpLastSliceHeader->bFieldPicFlag != kpCurSliceHeader->bFieldPicFlag) | 456 | if (kpLastSliceHeader->bFieldPicFlag != kpCurSliceHeader->bFieldPicFlag) |
| 457 | return TRUE; | 457 | return true; |
| 458 | if (kpLastSliceHeader->bBottomFiledFlag != kpCurSliceHeader->bBottomFiledFlag) | 458 | if (kpLastSliceHeader->bBottomFiledFlag != kpCurSliceHeader->bBottomFiledFlag) |
| 459 | return TRUE; | 459 | return true; |
| 460 | if ((kpLastNalHeaderExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (kpCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc | 460 | if ((kpLastNalHeaderExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (kpCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc |
| 461 | != NRI_PRI_LOWEST)) | 461 | != NRI_PRI_LOWEST)) |
| 462 | return TRUE; | 462 | return true; |
| 463 | if (kpLastNalHeaderExt->bIdrFlag != kpCurNalHeaderExt->bIdrFlag) | 463 | if (kpLastNalHeaderExt->bIdrFlag != kpCurNalHeaderExt->bIdrFlag) |
| 464 | return TRUE; | 464 | return true; |
| 465 | if (kpCurNalHeaderExt->bIdrFlag) { | 465 | if (kpCurNalHeaderExt->bIdrFlag) { |
| 466 | if (kpLastSliceHeader->uiIdrPicId != kpCurSliceHeader->uiIdrPicId) | 466 | if (kpLastSliceHeader->uiIdrPicId != kpCurSliceHeader->uiIdrPicId) |
| 467 | return TRUE; | 467 | return true; |
| 468 | } | 468 | } |
| 469 | if (kpSps->uiPocType == 0) { | 469 | if (kpSps->uiPocType == 0) { |
| 470 | if (kpLastSliceHeader->iPicOrderCntLsb != kpCurSliceHeader->iPicOrderCntLsb) | 470 | if (kpLastSliceHeader->iPicOrderCntLsb != kpCurSliceHeader->iPicOrderCntLsb) |
| 471 | return TRUE; | 471 | return true; |
| 472 | if (kpLastSliceHeader->iDeltaPicOrderCntBottom != kpCurSliceHeader->iDeltaPicOrderCntBottom) | 472 | if (kpLastSliceHeader->iDeltaPicOrderCntBottom != kpCurSliceHeader->iDeltaPicOrderCntBottom) |
| 473 | return TRUE; | 473 | return true; |
| 474 | } else if (kpSps->uiPocType == 1) { | 474 | } else if (kpSps->uiPocType == 1) { |
| 475 | if (kpLastSliceHeader->iDeltaPicOrderCnt[0] != kpCurSliceHeader->iDeltaPicOrderCnt[0]) | 475 | if (kpLastSliceHeader->iDeltaPicOrderCnt[0] != kpCurSliceHeader->iDeltaPicOrderCnt[0]) |
| 476 | return TRUE; | 476 | return true; |
| 477 | if (kpLastSliceHeader->iDeltaPicOrderCnt[1] != kpCurSliceHeader->iDeltaPicOrderCnt[1]) | 477 | if (kpLastSliceHeader->iDeltaPicOrderCnt[1] != kpCurSliceHeader->iDeltaPicOrderCnt[1]) |
| 478 | return TRUE; | 478 | return true; |
| 479 | } | 479 | } |
| 480 | 480 | ||
| 481 | return FALSE; | 481 | return false; |
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | /*! | 484 | /*! |