Merge branch 'master' of https://github.com/OpenVisualCloud/SVT-HEVC

# Conflicts:
#	Source/Lib/Codec/EbCodingLoop.c
#	Source/Lib/Codec/EbDefinitions.h
#	Source/Lib/Codec/EbEncDecProcess.c
#	Source/Lib/Codec/EbEntropyCoding.h
#	Source/Lib/Codec/EbPacketizationProcess.c
#	Source/Lib/Codec/EbPictureControlSet.c
#	Source/Lib/Codec/EbPictureControlSet.h

Author: kirithika7

Source/Lib/Codec/EbEncDecProcess.c

@@ -1403,11 +1403,7 @@ static void ResetEncDec(
                     pictureControlSetPtr->coeffEstEntropyCoderPtr,
                     entropyCodingQp,
                     pictureControlSetPtr->sliceType);
-            //ResetEntropyCoder(
-            //    sequenceControlSetPtr->encodeContextPtr,
-            //    pictureControlSetPtr->tempEntropyCoderPtr,
-            //    entropyCodingQp,
-            //    pictureControlSetPtr->sliceType);
+
             //this function could be optimized by removed chroma, and unessary TU sizes.
             PrecomputeCabacCost(&(*pictureControlSetPtr->cabacCost),
                     (CabacEncodeContext_t*)pictureControlSetPtr->coeffEstEntropyCoderPtr->cabacEncodeContextPtr);
@@ -4076,7 +4072,6 @@ void* EncDecKernel(void *inputPtr)
 
     //Proxy entropy coding
     EbPictureBufferDesc_t *  tempCoeffPicturePtr;
-    EB_U32                   totalbits = 0;
     EB_U32                   tempWrittenBitsBeforeQuantizedCoeff;
     EB_U32                   tempWrittenBitsAfterQuantizedCoeff;
     EB_U32                   bestOisCuIndex = 0;

Source/Lib/Codec/EbPacketizationProcess.c

@@ -631,7 +631,7 @@ void* PacketizationKernel(void *inputPtr)
 
         // Jing: process multiple tiles
         for (tileIdx = 0; tileIdx < tileCnt; tileIdx++) {
-            EB_U32 lcuSize = sequenceControlSetPtr->lcuSize;
+            EB_U32 lcuSize     = sequenceControlSetPtr->lcuSize;
             EB_U32 lcuSizeLog2 = (EB_U8)Log2f(lcuSize);
             EB_U32 pictureWidthInLcu = (sequenceControlSetPtr->lumaWidth + lcuSize - 1) >> lcuSizeLog2;
             EB_U32 xLcuStart = 0;
@@ -648,23 +648,23 @@ void* PacketizationKernel(void *inputPtr)
             // Encode slice header
             if (tileIdx == 0 || sequenceControlSetPtr->tileSliceMode == 1) {
                 EncodeSliceHeader(
-                    lcuIndex,
-                    packetizationQp,
-                    pictureControlSetPtr,
-                    (OutputBitstreamUnit_t*)pictureControlSetPtr->bitstreamPtr->outputBitstreamPtr);
+                        lcuIndex,
+                        packetizationQp,
+                        pictureControlSetPtr,
+                        (OutputBitstreamUnit_t*) pictureControlSetPtr->bitstreamPtr->outputBitstreamPtr);
 
                 // Flush the Bitstream
                 FlushBitstream(
-                    pictureControlSetPtr->bitstreamPtr->outputBitstreamPtr);
+                        pictureControlSetPtr->bitstreamPtr->outputBitstreamPtr);      
 
                 // Copy Slice Header to the Output Bitstream
                 CopyRbspBitstreamToPayload(
-                    pictureControlSetPtr->bitstreamPtr,
-                    outputStreamPtr->pBuffer,
-                    (EB_U32*) &(outputStreamPtr->nFilledLen),
-                    (EB_U32*) &(outputStreamPtr->nAllocLen),
-                    encodeContextPtr,
-                    NAL_UNIT_INVALID);
+                        pictureControlSetPtr->bitstreamPtr,
+                        outputStreamPtr->pBuffer,
+                        (EB_U32*) &(outputStreamPtr->nFilledLen),
+                        (EB_U32*) &(outputStreamPtr->nAllocLen),
+                        encodeContextPtr,
+                        NAL_UNIT_INVALID);
 
                 // Reset the bitstream
                 ResetBitstream(pictureControlSetPtr->bitstreamPtr->outputBitstreamPtr);

Source/Lib/Codec/EbPictureControlSet.h

@@ -264,10 +264,10 @@ typedef struct PictureControlSet_s
     NeighborArrayUnit_t                  **intraLumaModeNeighborArray;
     NeighborArrayUnit_t                  **skipFlagNeighborArray;
 
-	NeighborArrayUnit_t                  *tempModeTypeNeighborArray;
-	NeighborArrayUnit_t                  *tempLeafDepthNeighborArray;
-	NeighborArrayUnit_t                  *tempIntraLumaModeNeighborArray;
-	NeighborArrayUnit_t                  *tempSkipFlagNeighborArray;
+    NeighborArrayUnit_t                  *tempModeTypeNeighborArray;
+    NeighborArrayUnit_t                  *tempLeafDepthNeighborArray;
+    NeighborArrayUnit_t                  *tempIntraLumaModeNeighborArray;
+    NeighborArrayUnit_t                  *tempSkipFlagNeighborArray;
 
     EB_REFLIST                            colocatedPuRefList;
     EB_BOOL                               isLowDelay;