astyle code style for enc

Guangwei Wang committed 9 years ago

Commit 3d150f01 parent bc8317915 files · +184 −172Browse files

Showing the changes to codec/encoder/core/src/svc_enc_slice_segment.cpp (1 of 15 files). Show all

Unified · Split

codec/encoder/core/src/svc_enc_slice_segment.cpp+26−27

  *
  * \return  0 - successful; none 0 - failed
  */
-int32_t AssignMbMapMultipleSlices (SDqLayer* pCurDq,const SSliceArgument* kpSliceArgument) {
+int32_t AssignMbMapMultipleSlices (SDqLayer* pCurDq, const SSliceArgument* kpSliceArgument) {
   SSliceCtx* pSliceSeg   = &pCurDq->sSliceEncCtx;
   int32_t iSliceIdx      = 0;
   if (NULL == pSliceSeg || SM_SINGLE_SLICE == pSliceSeg->uiSliceMode)
     iSliceIdx = 0;
     while (iSliceIdx < iSliceNum) {
       const int32_t kiFirstMb                       = iSliceIdx * kiMbWidth;
-      WelsSetMemMultiplebytes_c(pSliceSeg->pOverallMbMap + kiFirstMb, iSliceIdx,
+      WelsSetMemMultiplebytes_c (pSliceSeg->pOverallMbMap + kiFirstMb, iSliceIdx,
-                                kiMbWidth, sizeof(uint16_t));
+                                 kiMbWidth, sizeof (uint16_t));
       ++ iSliceIdx;
     }
       ++ iSliceIdx;
     } while (iSliceIdx < kiCountSliceNumInFrame && iMbIdx < kiCountNumMbInFrame);
   } else if (SM_SIZELIMITED_SLICE == pSliceSeg->uiSliceMode) {
-     // do nothing,pSliceSeg->pOverallMbMap will be initial later
+    // do nothing,pSliceSeg->pOverallMbMap will be initial later
   } else { // any else uiSliceMode?
     assert (0);
   }
   pSlicesAssignList[uiSliceIdx] = iNumMbLeft;
-  if (iNumMbLeft <= 0 || kiMbNumPerSlice <= 0 ) {
+  if (iNumMbLeft <= 0 || kiMbNumPerSlice <= 0) {
     return false;
   }
     if (iNumMbAssigning < iMinimalMbNum)
       iCurNumMbAssigning = iMinimalMbNum;
     else if (iNumMbAssigning > iMaximalMbNum)
-      iCurNumMbAssigning = ( iMaximalMbNum / iGomSize ) * iGomSize;
+      iCurNumMbAssigning = (iMaximalMbNum / iGomSize) * iGomSize;
     else
       iCurNumMbAssigning = iNumMbAssigning;
     ++ uiSliceIdx;
   }
   pSlicesAssignList[uiSliceIdx] = iNumMbLeft;
-  if ( iNumMbLeft < iMinimalMbNum ) {
+  if (iNumMbLeft < iMinimalMbNum) {
     return false;
   }
     return -1;
   switch (pSliceArgument->uiSliceMode) {
-    case SM_SINGLE_SLICE:
+  case SM_SINGLE_SLICE:
-    case SM_FIXEDSLCNUM_SLICE:
+  case SM_FIXEDSLCNUM_SLICE:
-    case SM_RASTER_SLICE:
+  case SM_RASTER_SLICE: {
-      {
+    return pSliceArgument->uiSliceNum;
-        return pSliceArgument->uiSliceNum;
+  }
-    }
+  case SM_SIZELIMITED_SLICE: {
-    case SM_SIZELIMITED_SLICE: {
+    return AVERSLICENUM_CONSTRAINT;//at the beginning of dynamic slicing, set the uiSliceNum to be 1
-      return AVERSLICENUM_CONSTRAINT;//at the beginning of dynamic slicing, set the uiSliceNum to be 1
+  }
-    }
+  case SM_RESERVED:
-    case SM_RESERVED:
+  default: {
-    default: {
+    return -1;
-      return -1;
+  }
-    }
   }
   return -1;
     return AssignMbMapSingleSlice (pSliceSeg->pOverallMbMap, kiCountMbNum, sizeof (pSliceSeg->pOverallMbMap[0]));
   } else { //if ( SM_MULTIPLE_SLICE == uiSliceMode )
     if (uiSliceMode != SM_FIXEDSLCNUM_SLICE && uiSliceMode != SM_RASTER_SLICE
-        && uiSliceMode != SM_SIZELIMITED_SLICE )
+        && uiSliceMode != SM_SIZELIMITED_SLICE)
       return 1;
     pSliceSeg->pOverallMbMap = (uint16_t*)pMa->WelsMallocz (kiCountMbNum * sizeof (uint16_t), "pSliceSeg->pOverallMbMap");
     WELS_VERIFY_RETURN_IF (1, NULL == pSliceSeg->pOverallMbMap)
-    WelsSetMemMultiplebytes_c(pSliceSeg->pOverallMbMap, 0, kiCountMbNum, sizeof(uint16_t));
+    WelsSetMemMultiplebytes_c (pSliceSeg->pOverallMbMap, 0, kiCountMbNum, sizeof (uint16_t));
     //SM_SIZELIMITED_SLICE: init, set pSliceSeg->iSliceNumInFrame = 1;
     pSliceSeg->iSliceNumInFrame = GetInitialSliceNum (pSliceArgument);
  * \return  iFirstMb - successful; -1 - failed;
  */
 int32_t WelsGetFirstMbOfSlice (SDqLayer* pCurLayer, const int32_t kuiSliceIdc) {
-  if ( NULL == pCurLayer || NULL == pCurLayer->pFirstMbIdxOfSlice ) {
+  if (NULL == pCurLayer || NULL == pCurLayer->pFirstMbIdxOfSlice) {
     return -1;
   }
  *
  * \return  count_num_of_mb - successful; -1 - failed;
  */
-int32_t WelsGetNumMbInSlice  (SDqLayer* pCurDq, SSlice* pSlice, const int32_t kuiSliceIdc) {
+int32_t WelsGetNumMbInSlice (SDqLayer* pCurDq, SSlice* pSlice, const int32_t kuiSliceIdc) {
   SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx;
   bool bInValidFlag    = false;
   bInValidFlag = ((SM_SINGLE_SLICE != pSliceCtx->uiSliceMode) && (kuiSliceIdc >= pSliceCtx->iSliceNumInFrame))
                  || ((SM_SINGLE_SLICE == pSliceCtx->uiSliceMode) && (kuiSliceIdc > 0));
-  if(bInValidFlag) {
+  if (bInValidFlag) {
     return -1;
   }
     pCurDq->pFirstMbIdxOfSlice[iSliceIdx]         = iFirstMbIdx;
     pCurDq->pCountMbNumInSlice[iSliceIdx]         = kiSliceRun;
-    WelsSetMemMultiplebytes_c(pSliceCtx->pOverallMbMap + iFirstMbIdx, iSliceIdx,
+    WelsSetMemMultiplebytes_c (pSliceCtx->pOverallMbMap + iFirstMbIdx, iSliceIdx,
-                              kiSliceRun, sizeof(uint16_t));
+                               kiSliceRun, sizeof (uint16_t));
     iFirstMbIdx += kiSliceRun;

astyle code style for enc

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code