Include-what-you-use and removed (some few) unnecessary includes.

CPPLINT.cfg

@@ -0,0 +1,3 @@
+set noparent
+filter=-,+build/include_what_you_use,+build/forward_decl,+build/printf_format,+legal/copyright,+build/include,-build/include_alpha,-build/include_order
+linelength=120

Makefile.am

@@ -22,6 +22,7 @@ EXTRA_DIST = .travis.yml \
   m4/m4_ax_check_compile_flag.m4 \
   Makefile.vc7 \
   CMakeLists.txt \
+  CPPLINT.cfg \
   README.md \
   libde265.png \
   */COPYING

libde265/CPPLINT.cfg

@@ -0,0 +1,2 @@
+exclude_files=md5\..*
+

libde265/Makefile.am

@@ -124,6 +124,7 @@ endif
 
 EXTRA_DIST = Makefile.vc7 \
   CMakeLists.txt \
+  CPPLINT.cfg \
   ../extra/stdbool.h \
   ../extra/stdint.h
 

libde265/alloc_pool.h

@@ -24,7 +24,7 @@
 #define ALLOC_POOL_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "config.h"  // NOLINT(build/include)
 #endif
 
 #include <vector>

libde265/arm/arm.cc

@@ -19,13 +19,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "config.h"  // NOLINT(build/include)
 #endif
 
-#include "arm.h"
-
 #include <stdio.h>
 
+#include "libde265/arm/arm.h"
+
 // TODO: on linux, use getauxval(AT_HWCAP);
 static bool detect_neon()
 {

libde265/arm/arm.h

@@ -21,7 +21,7 @@
 #ifndef LIBDE265_ARM_H
 #define LIBDE265_ARM_H
 
-#include "acceleration.h"
+#include "libde265/acceleration.h"
 
 void init_acceleration_functions_neon(struct acceleration_functions* accel);
 void init_acceleration_functions_aarch64(struct acceleration_functions* accel);

libde265/bitstream.cc

@@ -18,13 +18,12 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bitstream.h"
-#include "de265.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
+#include "libde265/bitstream.h"
+#include "libde265/de265.h"
 
 
 void bitreader_init(bitreader* br, unsigned char* buffer, int len)

libde265/cabac.cc

@@ -18,14 +18,14 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cabac.h"
-#include "util.h"
-
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 
+#include "libde265/cabac.h"
+#include "libde265/util.h"
+
 #define INITIAL_CABAC_BUFFER_CAPACITY 4096
 
 

libde265/cabac.h

@@ -22,8 +22,8 @@
 #define DE265_CABAC_H
 
 #include <stdint.h>
-#include "contextmodel.h"
 
+#include "libde265/contextmodel.h"
 
 typedef struct {
   uint8_t* bitstream_start;

libde265/codingdata-impl.h

@@ -23,9 +23,9 @@
 
 #include <stdint.h>
 
-#include "codingdata.h"
-#include "image.h"
-#include "encoder/encoder-context.h"
+#include "libde265/codingdata.h"
+#include "libde265/image.h"
+#include "libde265/encoder/encoder-context.h"
 
 
 template <> class CodingDataAccess<image>

libde265/configparam.cc

@@ -20,8 +20,6 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "configparam.h"
-
 #include <string.h>
 #include <ctype.h>
 #include <sstream>
@@ -30,6 +28,8 @@
 #include <algorithm>
 #include <typeinfo>
 
+#include "libde265/configparam.h"
+
 #ifndef RTTI_ENABLED
 #error "Need to compile with RTTI enabled."
 #endif

libde265/configparam.h

@@ -23,15 +23,16 @@
 #ifndef CONFIG_PARAM_H
 #define CONFIG_PARAM_H
 
-#include "en265.h"
-#include "util.h"
-
 #include <climits>
+#include <utility>
 #include <vector>
 #include <string>
 #include <stddef.h>
 #include <assert.h>
 
+#include "libde265/en265.h"
+#include "libde265/util.h"
+
 
 /* Notes: probably best to keep cmd-line-options here. So it will be:
    - automatically consistent even when having different combinations of algorithms

libde265/contextmodel.cc

@@ -18,11 +18,13 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "slice.h"
 #include <assert.h>
 #include <iomanip>
 #include <sstream>
 
+#include "libde265/contextmodel.h"
+#include "libde265/slice.h"
+
 bool D = false;
 
 context_model_table::context_model_table()

libde265/contextmodel.h

@@ -24,7 +24,6 @@
 #ifndef DE265_CONTEXTMODEL_H
 #define DE265_CONTEXTMODEL_H
 
-#include "libde265/cabac.h"
 #include "libde265/de265.h"
 
 #include <string.h>

libde265/de265.cc

@@ -20,18 +20,16 @@
 
 #define DEBUG_INSERT_STREAM_ERRORS 0
 
-
-#include "de265.h"
-#include "decctx.h"
-#include "util.h"
-#include "scan.h"
-#include "image.h"
-#include "sei.h"
-
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
+#include "libde265/de265.h"
+#include "libde265/decctx.h"
+#include "libde265/util.h"
+#include "libde265/scan.h"
+#include "libde265/image.h"
+#include "libde265/sei.h"
 
 // TODO: should be in some vps.c related header
 de265_error read_vps(decoder_context* ctx, bitreader* reader, video_parameter_set* vps);

libde265/deblock.cc

@@ -18,15 +18,17 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "deblock.h"
-#include "util.h"
-#include "transform.h"
-#include "de265.h"
-#include "image-unit.h"
-
 #include <assert.h>
 
+#include <algorithm>
+#include <memory>
+#include <string>
 
+#include "libde265/de265.h"
+#include "libde265/deblock.h"
+#include "libde265/image-unit.h"
+#include "libde265/transform.h"
+#include "libde265/util.h"
 
 // 8.7.2.1 for both EDGE_HOR and EDGE_VER at the same time
 void markTransformBlockBoundary(image* img, int x0,int y0,

libde265/decctx.cc

@@ -18,41 +18,42 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "decctx.h"
-#include "util.h"
-#include "sao.h"
-#include "sei.h"
-#include "deblock.h"
-#include "image-unit.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"  // NOLINT(build/include)
+#endif
 
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 
-#include "fallback.h"
+#include <algorithm>
+#include <string>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "libde265/decctx.h"
+#include "libde265/util.h"
+#include "libde265/sao.h"
+#include "libde265/sei.h"
+#include "libde265/deblock.h"
+#include "libde265/image-unit.h"
+
+#include "libde265/fallback.h"
 
 #ifdef HAVE_SSE4_1
-#include "x86/sse.h"
+#include "libde265/x86/sse.h"
 #endif
 
 #ifdef HAVE_NEON
-#include "arm/arm.h"
+#include "libde265/arm/arm.h"
 #endif
 
 #define SAVE_INTERMEDIATE_IMAGES 0
 
 #if SAVE_INTERMEDIATE_IMAGES
-#include "visualize.h"
+#include "libde265/visualize.h"
 #endif
 
-#include <iostream> // TODO TMP
-
 extern void thread_decode_CTB_row(void* d);
 extern void thread_decode_slice_segment(void* d);
 

libde265/decctx.h

@@ -38,7 +38,9 @@
 #include "libde265/frame-dropper.h"
 #include "libde265/frontend-syntax-decoder.h"
 
+#include <deque>
 #include <memory>
+#include <vector>
 
 #define DE265_MAX_VPS_SETS 16   // this is the maximum as defined in the standard
 #define DE265_MAX_SPS_SETS 16   // this is the maximum as defined in the standard

libde265/dpb.cc

@@ -18,11 +18,11 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dpb.h"
-#include "decctx.h"
 #include <string.h>
 #include <assert.h>
 
+#include "libde265/dpb.h"
+#include "libde265/decctx.h"
 
 #define DPB_DEFAULT_MAX_IMAGES  30
 

libde265/dpb.h

@@ -25,6 +25,7 @@
 #include "libde265/sps.h"
 
 #include <deque>
+#include <memory>
 #include <vector>
 
 class decoder_context;

libde265/encoder/algo/cb-intrapartmode.cc

@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-#include <iostream>
 
 
 #define ENCODER_DEVELOPMENT 1

libde265/encoder/algo/cb-mergeindex.cc

@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-
+#include <memory>
 
 
 

libde265/encoder/algo/cb-split.cc

@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-#include <iostream>
 
 
 // Utility function to encode all four children in a splitted CB.

libde265/encoder/algo/coding-options.cc

@@ -20,6 +20,8 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <utility>
+
 #include "libde265/encoder/algo/coding-options.h"
 #include "libde265/encoder/encoder-context.h"
 

libde265/encoder/algo/coding-options.h

@@ -23,6 +23,8 @@
 #ifndef CODING_OPTIONS_H
 #define CODING_OPTIONS_H
 
+#include <vector>
+
 #include "libde265/encoder/encoder-types.h"
 
 

libde265/encoder/algo/pb-mv.cc

@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
+#include <memory>
 
 
 

libde265/encoder/algo/tb-intrapredmode.cc

@@ -20,16 +20,17 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "libde265/encoder/encoder-context.h"
-#include "libde265/encoder/algo/tb-split.h"
-#include "libde265/encoder/algo/coding-options.h"
 #include <assert.h>
 #include <limits>
 #include <math.h>
 #include <algorithm>
-#include <iostream>
+#include <utility>
+#include <vector>
 
+#include "libde265/encoder/encoder-context.h"
+#include "libde265/encoder/algo/tb-split.h"
+#include "libde265/encoder/algo/coding-options.h"
+#include "libde265/encoder/algo/tb-intrapredmode.h"
 
 float get_intra_pred_mode_bits(const enum IntraPredMode candidates[3],
                                enum IntraPredMode intraMode,

libde265/encoder/algo/tb-intrapredmode.h

@@ -23,6 +23,8 @@
 #ifndef TB_INTRAPREDMODE_H
 #define TB_INTRAPREDMODE_H
 
+#include <memory>
+
 #include "libde265/nal-parser.h"
 #include "libde265/decctx.h"
 #include "libde265/encoder/encoder-types.h"