shithub: openh264

Download patch

ref: 790110b2ce9936c42688058a30b475e8ff084208
parent: dba62070bf64f6f1ec2729563df183898e0eef19
author: Martin Storsjö <martin@martin.st>
date: Sat Dec 28 18:37:45 EST 2013 

Remove commented out pragmas


--- a/codec/decoder/core/inc/bit_stream.h
+++ b/codec/decoder/core/inc/bit_stream.h
@@ -53,8 +53,6 @@
 // need pointer to next byte start position in case 0 bit left then 8 instead
 } SBitStringAux, *PBitStringAux;
 
-//#pragma pack()
-
 /*!
  * \brief	input bits for decoder or initialize bitstream writing in encoder
  *
--- a/codec/decoder/core/inc/deblocking.h
+++ b/codec/decoder/core/inc/deblocking.h
@@ -43,8 +43,6 @@
 
 #include "decoder_context.h"
 
-//#pragma pack(1)
-
 namespace WelsDec {
 
 /*!
@@ -125,8 +123,6 @@
 #endif//__cplusplus
 
 } // namespace WelsDec
-
-//#pragma pack()
 
 #endif //WELS_DEBLOCKING_H__
 
--- a/codec/decoder/core/inc/decoder_context.h
+++ b/codec/decoder/core/inc/decoder_context.h
@@ -72,8 +72,6 @@
 //extern "C" {
 //#endif//__cplusplus
 
-//#pragma pack(1)
-
 /*
  *	Need move below structures to function pointer to seperate module/file later
  */
@@ -335,8 +333,6 @@
 #endif
 
 } SWelsDecoderContext, *PWelsDecoderContext;
-
-//#pragma pack()
 
 //#ifdef __cplusplus
 //}
--- a/codec/decoder/core/inc/get_intra_predictor.h
+++ b/codec/decoder/core/inc/get_intra_predictor.h
@@ -43,8 +43,6 @@
 
 #include "typedefs.h"
 
-//#pragma pack(1)
-
 namespace WelsDec {
 
 void_t WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
@@ -113,8 +111,6 @@
 #endif//__cplusplus
 
 } // namespace WelsDec
-
-//#pragma pack()
 
 #endif //WELS_GET_INTRA_PREDICTOR_H__
 
--- a/codec/decoder/core/inc/mb_cache.h
+++ b/codec/decoder/core/inc/mb_cache.h
@@ -38,8 +38,6 @@
 
 namespace WelsDec {
 
-//#pragma pack(1)
-
 #define REF_NOT_AVAIL    -2
 #define REF_NOT_IN_LIST  -1  //intra
 
--- a/codec/decoder/core/inc/nal_prefix.h
+++ b/codec/decoder/core/inc/nal_prefix.h
@@ -40,8 +40,6 @@
 
 namespace WelsDec {
 
-//#pragma pack(1)
-
 ///////////////////////////////////NAL Unit prefix/headers///////////////////////////////////
 
 /* NAL Unix Header in AVC, refer to Page 56 in JVT X201wcm */
@@ -81,8 +79,6 @@
   bool_t		bPrefixNalUnitAdditionalExtFlag;
   bool_t		bPrefixNalUnitExtFlag;
 } SPrefixNalUnit, *PPrefixNalUnit;
-
-//#pragma pack()
 
 } // namespace WelsDec
 
--- a/codec/decoder/core/inc/parameter_sets.h
+++ b/codec/decoder/core/inc/parameter_sets.h
@@ -39,8 +39,6 @@
 
 namespace WelsDec {
 
-//#pragma pack(1)
-
 /* Sequence Parameter Set, refer to Page 57 in JVT X201wcm */
 typedef struct TagSps {
 int32_t	    iSpsId;
@@ -165,8 +163,6 @@
 uint8_t		uiWeightedBipredIdc;
 
 } SPps, *PPps;
-
-//#pragma pack()
 
 } // namespace WelsDec
 
--- a/codec/decoder/core/inc/parse_mb_syn_cavlc.h
+++ b/codec/decoder/core/inc/parse_mb_syn_cavlc.h
@@ -211,7 +211,5 @@
 int32_t ParseInterInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30],
                         PBitStringAux pBs);
 
-//#pragma pack()
-
 } // namespace WelsDec
 #endif//WELS_PARSE_MB_SYN_CAVLC_H__
--- a/codec/decoder/core/inc/pic_queue.h
+++ b/codec/decoder/core/inc/pic_queue.h
@@ -37,8 +37,6 @@
 
 #include "picture.h"
 
-//#pragma pack(1)
-
 namespace WelsDec {
 
 #define   PICTURE_RESOLUTION_ALIGNMENT      32
@@ -57,7 +55,5 @@
 PPicture PrefetchPic (PPicBuff pPicBuff);  // To get current node applicable
 
 } // namespace WelsDec
-
-//#pragma pack()
 
 #endif//WELS_PICTURE_QUEUE_H__
--- a/codec/decoder/core/inc/picture.h
+++ b/codec/decoder/core/inc/picture.h
@@ -36,8 +36,6 @@
 
 #include "typedefs.h"
 
-//#pragma pack(1)
-
 namespace WelsDec {
 
 /*
@@ -81,7 +79,5 @@
 } SPicture, *PPicture;	// "Picture" declaration is comflict with Mac system
 
 } // namespace WelsDec
-
-//#pragma pack()
 
 #endif//WELS_PICTURE_H__
--- a/codec/decoder/core/inc/rec_mb.h
+++ b/codec/decoder/core/inc/rec_mb.h
@@ -47,8 +47,6 @@
 
 #include "decoder_context.h"
 
-//#pragma pack(1)
-
 namespace WelsDec {
 
 void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer);
@@ -69,8 +67,6 @@
                      int32_t iBlockWidth, int32_t iBlockHeight, int32_t iSrcX, int32_t iSrcY, int32_t iPicWidth, int32_t iPicHeight);
 
 } // namespace WelsDec
-
-//#pragma pack()
 
 #endif //WELS_REC_MB_H__
 
--- a/codec/decoder/core/inc/slice.h
+++ b/codec/decoder/core/inc/slice.h
@@ -40,8 +40,6 @@
 #include "picture.h"
 #include "parameter_sets.h"
 
-//#pragma pack(1)
-
 namespace WelsDec {
 
 /*
@@ -203,5 +201,4 @@
 
 } // namespace WelsDec
 
-//#pragma pack()
 #endif//WELS_SLICE_H__
--- a/codec/encoder/core/inc/extern.h
+++ b/codec/encoder/core/inc/extern.h
@@ -45,8 +45,6 @@
 
 namespace WelsSVCEnc {
 
-//#pragma pack()
-
 /*!
  * \brief	initialize source picture body
  * \param	kpSrc		SSourcePicture*
--- a/codec/encoder/core/inc/get_intra_predictor.h
+++ b/codec/encoder/core/inc/get_intra_predictor.h
@@ -122,7 +122,6 @@
 void WelsInitFillingPredFuncs (const uint32_t kuiCpuFlag);
 void WelsInitIntraPredFuncs (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag);
 
-//#pragma pack()
 }
 #endif //GET_INTRA_PREDICTOR_H
 
--- a/codec/encoder/core/inc/mb_cache.h
+++ b/codec/encoder/core/inc/mb_cache.h
@@ -40,7 +40,6 @@
 #include "macros.h"
 
 namespace WelsSVCEnc {
-//#pragma pack(1)
 
 /*
  *	MB Cache information, such one cache should be defined within a slice
--- a/codec/encoder/core/inc/parameter_sets.h
+++ b/codec/encoder/core/inc/parameter_sets.h
@@ -38,7 +38,6 @@
 #include "wels_common_basis.h"
 
 namespace WelsSVCEnc {
-//#pragma pack(1)
 
 /* Sequence Parameter Set, refer to Page 57 in JVT X201wcm */
 typedef struct TagWelsSPS {
@@ -159,7 +158,6 @@
 
 } SWelsPPS, *PWelsPPPS;
 
-//#pragma pack()
 }
 
 #endif //WELS_PARAMETER_SETS_H__
--- a/codec/encoder/core/inc/picture.h
+++ b/codec/encoder/core/inc/picture.h
@@ -37,7 +37,6 @@
 #include "typedefs.h"
 #include "as264_common.h"
 #include "wels_common_basis.h"
-//#pragma pack(1)
 
 namespace WelsSVCEnc {
 
@@ -90,8 +89,6 @@
 //	int32_t		used_linesize[4];// iLineSize of picture planes respectively used currently
 //	int32_t		planes;			// planes of YUV
 //}Rs_Picture_t;
-
-//#pragma pack()
 
 }	// end of namespace WelsSVCEnc {
 
--- a/codec/encoder/core/inc/set_mb_syn_cavlc.h
+++ b/codec/encoder/core/inc/set_mb_syn_cavlc.h
@@ -45,7 +45,6 @@
 #include "bit_stream.h"
 
 namespace WelsSVCEnc {
-//#pragma pack(1)
 
 
 
@@ -97,5 +96,4 @@
 #endif//__cplusplus
 
 }
-//#pragma pack()
 #endif
--- a/codec/encoder/core/inc/slice.h
+++ b/codec/encoder/core/inc/slice.h
@@ -179,5 +179,4 @@
 } SSlice, *PSlice;
 
 }
-//#pragma pack()
 #endif//WELS_SLICE_H__
--- a/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
+++ b/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
@@ -49,7 +49,6 @@
 #include "set_mb_syn_cavlc.h"
 
 namespace WelsSVCEnc {
-//#pragma pack(1)
 
 void WelsWriteMbResidual (SMbCache* sMbCacheInfo, SMB* pCurMb, SBitStringAux* pBs);
 
@@ -61,6 +60,5 @@
 //for Base Layer CAVLC writing
 void WelsSpatialWriteMbSyn (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb);
 
-//#pragma pack()
 }
 #endif