shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #212 from varunbpatil/enc_core_cleanup

Removed unused header files in encoder core

--- a/codec/encoder/core/src/au_set.cpp

+++ b/codec/encoder/core/src/au_set.cpp

@@ -38,8 +38,6 @@

  *************************************************************************************

  */

-#include <string.h>

-#include <assert.h>

 #include "au_set.h"

 #include "svc_enc_golomb.h"

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/deblocking.cpp

+++ b/codec/encoder/core/src/deblocking.cpp

@@ -38,7 +38,6 @@

  *************************************************************************************

  */

-#include "as264_common.h"

 #include "deblocking.h"

 #include "cpu_core.h"

 #include "array_stack_align.h"

--- a/codec/encoder/core/src/decode_mb_aux.cpp

+++ b/codec/encoder/core/src/decode_mb_aux.cpp

@@ -30,9 +30,7 @@

  *

  */

-#include <string.h>

 #include "decode_mb_aux.h"

-#include "wels_common_basis.h"

 #include "cpu_core.h"

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/encode_mb_aux.cpp

+++ b/codec/encoder/core/src/encode_mb_aux.cpp

@@ -30,14 +30,10 @@

  *

  */

-#include <string.h>

-#include "macros.h"

 #include "ls_defines.h"

 #include "encode_mb_aux.h"

 #include "cpu_core.h"

-#include "as264_common.h"

-#include "svc_encode_mb.h"

 namespace WelsSVCEnc {

 __align16 (const int16_t, g_kiQuantInterFF[58][8]) = {

--- a/codec/encoder/core/src/encoder.cpp

+++ b/codec/encoder/core/src/encoder.cpp

@@ -37,33 +37,20 @@

  *

  *************************************************************************************

  */

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <assert.h>

 #include "encoder.h"

-#include "extern.h"

-#include "cpu.h"

 #include "cpu_core.h"

-#include "utils.h"

-#include "encode_mb_aux.h"

 #include "decode_mb_aux.h"

 #include "get_intra_predictor.h"

-#include "svc_encode_mb.h"

 #include "deblocking.h"

-#include "expand_pic.h"

 #include "mc.h"

 #include "sample.h"

-#include "svc_encode_slice.h"

 #include "svc_base_layer_md.h"

-#include "svc_mode_decision.h"

 #include "set_mb_syn_cavlc.h"

 #include "crt_util_safe_x.h"	// Safe CRT routines like utils for cross_platforms

-#include "codec_def.h"

 #ifdef MT_ENABLED

 #include "slice_multi_threading.h"

 #endif//MT_ENABLED

--- a/codec/encoder/core/src/encoder_data_tables.cpp

+++ b/codec/encoder/core/src/encoder_data_tables.cpp

@@ -32,13 +32,7 @@

 // exp_data.c

 // export date cross various modules (.c)

-#include "typedefs.h"

-#include "wels_common_basis.h"

-#include "mb_cache.h"

-#include "utils.h"

 #include "md.h"

-#include "sample.h"

-#include "svc_enc_golomb.h"

 #include "vlc_encoder.h"

 namespace WelsSVCEnc {

 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -37,40 +37,24 @@

  *

  *************************************************************************************

  */

-#include <string.h>

-#include <stdlib.h>

-#include <assert.h>

 #include "encoder.h"

-#include "extern.h"

-#include "encoder_context.h"

-#include "typedefs.h"

-#include "wels_const.h"

-#include "wels_common_basis.h"

-#include "codec_def.h"

-#include "param_svc.h"

-#include "cpu_core.h"

 #include "cpu.h"

 #include "utils.h"

-#include "svc_enc_frame.h"

 #include "svc_enc_golomb.h"

-#include "svc_enc_slice_segment.h"

 #include "au_set.h"

 #include "picture_handle.h"

-#include "codec_app_def.h"

 #include "svc_base_layer_md.h"

 #include "svc_encode_slice.h"

 #include "decode_mb_aux.h"

 #include "deblocking.h"

-#include "rc.h"

 #include "ref_list_mgr_svc.h"

-#include "md.h"

 #include "ls_defines.h"

-#include "set_mb_syn_cavlc.h"

 #include "crt_util_safe_x.h"	// Safe CRT routines like utils for cross platforms

 #include "array_stack_align.h"

-// for MT, 4/22/2010

+#if defined(MT_ENABLED)

 #include "slice_multi_threading.h"

+#endif//MT_ENABLED

 #if defined(DYNAMIC_SLICE_ASSIGN) || defined(MT_DEBUG)

 #include "measure_time.h"

 #endif//DYNAMIC_SLICE_ASSIGN

--- a/codec/encoder/core/src/get_intra_predictor.cpp

+++ b/codec/encoder/core/src/get_intra_predictor.cpp

@@ -39,12 +39,9 @@

  *

  *************************************************************************************

  */

-#include <string.h>

-#include "macros.h"

 #include "ls_defines.h"

 #include "cpu_core.h"

 #include "get_intra_predictor.h"

-#include "wels_common_basis.h"

 #include "array_stack_align.h"

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/mc.cpp

+++ b/codec/encoder/core/src/mc.cpp

@@ -38,13 +38,7 @@

  *************************************************************************************

  */

-#include <string.h>

-#include "as264_common.h"

-#include "typedefs.h"

-#include "wels_const.h"

-#include "macros.h"

 #include "mc.h"

-#include "sample.h"

 #include "cpu_core.h"

 #include "array_stack_align.h"

--- a/codec/encoder/core/src/md.cpp

+++ b/codec/encoder/core/src/md.cpp

@@ -38,16 +38,10 @@

  *************************************************************************************

  */

-#include <string.h>

 #include "ls_defines.h"

-#include "encoder_context.h"

-#include "svc_enc_slice_segment.h"

 #include "md.h"

-#include "mc.h"

-#include "mv_pred.h"

 #include "cpu_core.h"

 #include "svc_enc_golomb.h"

-#include "sample.h"

 #include "array_stack_align.h"

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/memory_align.cpp

+++ b/codec/encoder/core/src/memory_align.cpp

@@ -32,7 +32,6 @@

 #include <stdlib.h>

 #include <string.h>

-#include <assert.h>

 #include "memory_align.h"

 #include "macros.h"

--- a/codec/encoder/core/src/picture_handle.cpp

+++ b/codec/encoder/core/src/picture_handle.cpp

@@ -36,12 +36,7 @@

  * \date	5/20/2009 Created

  *

  *************************************************************************************/

-#include <string.h>

-#include <assert.h>

 #include "picture_handle.h"

-#include "wels_const.h"

-#include "utils.h"

-#include "macros.h"

 namespace WelsSVCEnc {

 /*!

--- a/codec/encoder/core/src/property.cpp

+++ b/codec/encoder/core/src/property.cpp

@@ -37,8 +37,6 @@

  *

  *************************************************************************************

  */

-#include <string.h>

-#include <stdlib.h>

 #include "property.h"

 #include "crt_util_safe_x.h"	// Safe CRT routines like utils for cross_platforms

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/ratectl.cpp

+++ b/codec/encoder/core/src/ratectl.cpp

@@ -41,9 +41,6 @@

  *

  *

  *************************************************************************/

-#include <stdlib.h>

-#include <stdio.h>

-#include <math.h>

 #include "rc.h"

 #include "encoder_context.h"

 #include "utils.h"

--- a/codec/encoder/core/src/ref_list_mgr_svc.cpp

+++ b/codec/encoder/core/src/ref_list_mgr_svc.cpp

@@ -32,13 +32,7 @@

 // ref_list_mgr_svc.c

 #include "ref_list_mgr_svc.h"

-#include "encoder_context.h"

-#include "svc_enc_frame.h"

-#include "picture.h"

-#include "expand_pic.h"

-#include <assert.h>

 #include "utils.h"

-#include "extern.h"

 namespace WelsSVCEnc {

 /*

  *	set picture as unreferenced

--- a/codec/encoder/core/src/sample.cpp

+++ b/codec/encoder/core/src/sample.cpp

@@ -39,11 +39,9 @@

  */

 #include "sample.h"

-#include "macros.h"

 #include "mc.h"

 #include "cpu_core.h"

-#include "array_stack_align.h"

 namespace WelsSVCEnc {

 int32_t WelsSampleSad4x4_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {

--- a/codec/encoder/core/src/set_mb_syn_cavlc.cpp

+++ b/codec/encoder/core/src/set_mb_syn_cavlc.cpp

@@ -39,7 +39,6 @@

  */

 #include "set_mb_syn_cavlc.h"

-#include "svc_enc_golomb.h"

 #include "vlc_encoder.h"

 #include "cpu_core.h"

 #include "array_stack_align.h"

--- a/codec/encoder/core/src/svc_base_layer_md.cpp

+++ b/codec/encoder/core/src/svc_base_layer_md.cpp

@@ -37,15 +37,8 @@

  *

  *************************************************************************************

  */

-#include <string.h>

-#include <assert.h>

 #include "ls_defines.h"

-#include "encoder_context.h"

-#include "svc_enc_slice_segment.h"

-#include "md.h"

-#include "mc.h"

 #include "mv_pred.h"

-#include "cpu_core.h"

 #include "svc_enc_golomb.h"

 #include "svc_base_layer_md.h"

 #include "sample.h"

@@ -52,10 +45,6 @@

 #include "encoder.h"

 #include "svc_encode_mb.h"

 #include "svc_encode_slice.h"

-#include "svc_motion_estimate.h"

-#include "as264_common.h"

-#include "encode_mb_aux.h"

-#include "utils.h"

 namespace WelsSVCEnc {

 static const ALIGNED_DECLARE (int8_t, g_kiIntra16AvaliMode[8][5], 16) = {

   { I16_PRED_DC_128, I16_PRED_INVALID, I16_PRED_INVALID, I16_PRED_INVALID, 1 },

--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp

+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp

@@ -38,12 +38,6 @@

  *************************************************************************************

  */

 #include <string.h>

-#include <assert.h>

-#include "svc_enc_slice_segment.h"

-#include "wels_const.h"

-#include "macros.h"

-#include "utils.h"

-#include "macros.h"

 #include "rc.h"

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/svc_encode_mb.cpp

+++ b/codec/encoder/core/src/svc_encode_mb.cpp

@@ -37,16 +37,11 @@

  *************************************************************************************

  */

-#include <stdio.h>	//test use for file operation

-#include <string.h>

 #include "svc_encode_mb.h"

 #include "encode_mb_aux.h"

 #include "decode_mb_aux.h"

 #include "ls_defines.h"

-#include "cpu_core.h"

-#include "as264_common.h"

-#include "mb_cache.h"

 #include "array_stack_align.h"

 namespace WelsSVCEnc {

--- a/codec/encoder/core/src/svc_encode_slice.cpp

+++ b/codec/encoder/core/src/svc_encode_slice.cpp

@@ -38,23 +38,14 @@

  *************************************************************************************

  */

-#include <string.h>

-#include <assert.h>

 #include "ls_defines.h"

 #include "svc_encode_slice.h"

 #include "svc_enc_golomb.h"

 #include "svc_base_layer_md.h"

 #include "svc_encode_mb.h"

-#include "mv_pred.h"

 #include "svc_set_mb_syn_cavlc.h"

-#include "encode_mb_aux.h"

 #include "decode_mb_aux.h"

 #include "svc_mode_decision.h"

-#include "cpu_core.h"

-#include "svc_motion_estimate.h"

-#include "sample.h"

-#include "wels_func_ptr_def.h"

-#include "utils.h"

 namespace WelsSVCEnc {

 //#define ENC_TRACE

--- a/codec/encoder/core/src/svc_mode_decision.cpp

+++ b/codec/encoder/core/src/svc_mode_decision.cpp

@@ -38,26 +38,10 @@

  **************************************************************************************

  */

-#include <assert.h>

-#include <string.h>

-#include "decode_mb_aux.h"

-#include "svc_enc_golomb.h"

-#include "ls_defines.h"

-#include "md.h"

-#include "mv_pred.h"

-#include "sample.h"

 #include "svc_base_layer_md.h"

-#include "svc_encode_mb.h"

-#include "svc_encode_slice.h"

-#include "mb_cache.h"

 #include "svc_mode_decision.h"

-#include "svc_motion_estimate.h"

-#include "svc_set_mb_syn_cavlc.h"

-#include "cpu_core.h"

-#include "encode_mb_aux.h"

-#include "utils.h"

 namespace WelsSVCEnc {

 //

--- a/codec/encoder/core/src/svc_motion_estimate.cpp

+++ b/codec/encoder/core/src/svc_motion_estimate.cpp

@@ -39,16 +39,9 @@

  */

-#include <stdlib.h>

-#include <stdio.h>

-#include <string.h>

 #include "svc_motion_estimate.h"

-#include "svc_enc_golomb.h"

-#include "macros.h"

-#include "sample.h"

 #include "array_stack_align.h"

-#include "cpu_core.h"	// WELS_CPU_SSE41

 namespace WelsSVCEnc {

 /*!

--- a/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp

+++ b/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp

@@ -38,7 +38,6 @@

  *************************************************************************************

  */

-#include "svc_enc_golomb.h"

 #include "vlc_encoder.h"

 #include "ls_defines.h"

 #include "svc_set_mb_syn_cavlc.h"

--- a/codec/encoder/core/src/utils.cpp

+++ b/codec/encoder/core/src/utils.cpp

@@ -37,11 +37,6 @@

  *

  *************************************************************************************

  */

-#include <string.h>

-#include <stdlib.h>

-#include <assert.h>

-#include <math.h>

-#include <time.h>

 #if defined(_WIN32)

 #include <windows.h>

 #include <sys/types.h>

@@ -54,12 +49,8 @@

 #endif

 #include "utils.h"

-#include "macros.h"

-#include "wels_const.h"

 #include "property.h"

-#include "cpu_core.h"

 #include "encoder_context.h"

-#include "as264_common.h"

 #include "property.h"

 #include "crt_util_safe_x.h"	// Safe CRT routines like utils for cross platforms

--- a/codec/encoder/core/src/wels_preprocess.cpp

+++ b/codec/encoder/core/src/wels_preprocess.cpp

@@ -40,17 +40,9 @@

 #endif

 #endif

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <assert.h>

 #include "wels_preprocess.h"

-#include "memory_align.h"

-#include "encoder.h"

-#include "extern.h"

 #include "picture_handle.h"

 #include "encoder_context.h"

-#include "utils.h"

 #ifdef NO_DYNAMIC_VP

 EResult WELSAPI CreateVpInterface (void** ppCtx, int iVersion);