Add '-Wall' or '-fstack-protector' compilation flags

In addition, this fixes all warnings reported by -Wall Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
intel · Jun 5, 2018 · 1bea64e · 1bea64e
1 parent 71fc4bb
commit 1bea64e
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 64 deletions.
diff --git a/common/loadsurface.h b/common/loadsurface.h
@@ -306,6 +306,8 @@ static int upload_surface(VADisplay va_dpy, VASurfaceID surface_id,
     return 0;
 }
 
+#ifdef LIBVA_UTILS_UPLOAD_DOWNLOAD_YUV_SURFACE
+
 /*
  * Upload YUV data from memory into a surface
  * if src_fourcc == NV12, assume the buffer pointed by src_U
@@ -487,3 +489,5 @@ static int download_surface_yuv(VADisplay va_dpy, VASurfaceID surface_id,
 
     return 0;
 }
+
+#endif /* LIBVA_UTILS_UPLOAD_DOWNLOAD_YUV_SURFACE */
diff --git a/decode/Makefile.am b/decode/Makefile.am
@@ -23,6 +23,8 @@
 bin_PROGRAMS = mpeg2vldemo loadjpeg
 
 AM_CPPFLAGS = \
+	-Wall					\
+	-fstack-protector			\
 	$(LIBVA_CFLAGS)				\
 	-I$(top_srcdir)/common			\
 	$(NULL)

diff --git a/decode/tinyjpeg.c b/decode/tinyjpeg.c
@@ -176,21 +176,21 @@ static int build_default_huffman_tables(struct jdec_private *priv)
 
 static void print_SOF(const unsigned char *stream)
 {
-  int width, height, nr_components, precision;
 #if DEBUG
+  int width, height, nr_components, precision;
   const char *nr_components_to_string[] = {
      "????",
      "Grayscale",
      "????",
      "YCbCr",
      "CYMK"
   };
-#endif
 
   precision = stream[2];
   height = be16_to_cpu(stream+3);
   width  = be16_to_cpu(stream+5);
   nr_components = stream[7];
+#endif
 
   trace("> SOF marker\n");
   trace("Size:%dx%d nr_components:%d (%s)  precision:%d\n", 
@@ -578,8 +578,6 @@ int tinyjpeg_decode(struct jdec_private *priv)
     unsigned int i, j;
 
     int surface_type;
-    char *type;
-    int ChromaTypeIndex;
 
     VASurfaceAttrib forcc;
     forcc.type =VASurfaceAttribPixelFormat;
@@ -644,62 +642,46 @@ int tinyjpeg_decode(struct jdec_private *priv)
            //surface_type = VA_RT_FORMAT_IMC3;
            surface_type = VA_RT_FORMAT_YUV420;
            forcc.value.value.i = VA_FOURCC_IMC3;
-           ChromaTypeIndex = 1;
-           type = "VA_FOURCC_IMC3";
        }
        else if (h1 == 2 && h2 == 1 && h3 == 1 &&
                v1 == 1 && v2 == 1 && v3 == 1) {
            //surface_type = VA_RT_FORMAT_YUV422H;
            surface_type = VA_RT_FORMAT_YUV422;
            forcc.value.value.i = VA_FOURCC_422H;
-           ChromaTypeIndex = 2;
-           type = "VA_FOURCC_422H";
        }
        else if (h1 == 1 && h2 == 1 && h3 == 1 &&
                v1 == 1 && v2 == 1 && v3 == 1) {
            surface_type = VA_RT_FORMAT_YUV444;
            forcc.value.value.i = VA_FOURCC_444P;
            //forcc.value.value.i = VA_FOURCC_RGBP;
-           ChromaTypeIndex = 3;
-           type = "VA_FOURCC_444P";
        }
        else if (h1 == 4 && h2 == 1 && h3 == 1 &&
                v1 == 1 && v2 == 1 && v3 == 1) {
            surface_type = VA_RT_FORMAT_YUV411;
            forcc.value.value.i = VA_FOURCC_411P;
-           ChromaTypeIndex = 4;
-           type = "VA_FOURCC_411P";
        }
        else if (h1 == 1 && h2 == 1 && h3 == 1 &&
                v1 == 2 && v2 == 1 && v3 == 1) {
            //surface_type = VA_RT_FORMAT_YUV422V;
            surface_type = VA_RT_FORMAT_YUV422;
            forcc.value.value.i = VA_FOURCC_422V;
-           ChromaTypeIndex = 5;
-           type = "VA_FOURCC_422V";
        }
        else if (h1 == 2 && h2 == 1 && h3 == 1 &&
                v1 == 2 && v2 == 2 && v3 == 2) {
            //surface_type = VA_RT_FORMAT_YUV422H;
            surface_type = VA_RT_FORMAT_YUV422;
            forcc.value.value.i = VA_FOURCC_422H;
-           ChromaTypeIndex = 6;
-           type = "VA_FOURCC_422H";
        }
        else if (h2 == 2 && h2 == 2 && h3 == 2 &&
                v1 == 2 && v2 == 1 && v3 == 1) {
            //surface_type = VA_RT_FORMAT_YUV422V;
            surface_type = VA_RT_FORMAT_YUV422;
            forcc.value.value.i = VA_FOURCC_422V;
-           ChromaTypeIndex = 7;
-           type = "VA_FOURCC_422V";
        }
        else
        {
            surface_type = VA_RT_FORMAT_YUV400;
            forcc.value.value.i = VA_FOURCC('Y','8','0','0');
-           ChromaTypeIndex = 0;
-           type = "Format_400P";
        }
 
        va_status = vaCreateSurfaces(va_dpy,surface_type,

diff --git a/encode/Makefile.am b/encode/Makefile.am
@@ -25,6 +25,7 @@ noinst_PROGRAMS = svctenc
 
 AM_CPPFLAGS = \
 	-Wall				\
+	-fstack-protector		\
 	$(LIBVA_CFLAGS) 		\
 	$(NULL)
 

diff --git a/encode/h264encode.c b/encode/h264encode.c
@@ -21,6 +21,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#define LIBVA_UTILS_UPLOAD_DOWNLOAD_YUV_SURFACE 1
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -564,6 +566,8 @@ build_packed_seq_buffer(unsigned char **header_buffer)
     return bs.bit_offset;
 }
 
+#if 0
+
 static int 
 build_packed_sei_buffer_timing(unsigned int init_cpb_removal_length,
 				unsigned int init_cpb_removal_delay,
@@ -630,6 +634,8 @@ build_packed_sei_buffer_timing(unsigned int init_cpb_removal_length,
     return nal_bs.bit_offset;
 }
 
+#endif
+
 static int build_packed_slice_buffer(unsigned char **header_buffer)
 {
     bitstream bs;
@@ -1666,6 +1672,8 @@ static int render_packedpicture(void)
     return 0;
 }
 
+#if 0
+
 static void render_packedsei(void)
 {
     VAEncPackedHeaderParameterBuffer packed_header_param_buffer;
@@ -1728,7 +1736,6 @@ static void render_packedsei(void)
     return;
 }
 
-
 static int render_hrd(void)
 {
     VABufferID misc_parameter_hrd_buf_id;
@@ -1765,6 +1772,8 @@ static int render_hrd(void)
     return 0;
 }
 
+#endif
+
 static void render_packedslice()
 {
     VAEncPackedHeaderParameterBuffer packedheader_param_buffer;

diff --git a/putsurface/Makefile.am b/putsurface/Makefile.am
@@ -25,6 +25,8 @@ bin_PROGRAMS =
 TEST_CFLAGS = \
 	$(LIBVA_CFLAGS)			\
 	-I$(top_srcdir)/common		\
+	-Wall				\
+	-fstack-protector		\
 	$(NULL)
 
 TEST_LIBS = \

diff --git a/vainfo/Makefile.am b/vainfo/Makefile.am
@@ -26,6 +26,8 @@ vainfo_cflags = \
 	-I$(top_srcdir)/common \
 	$(LIBVA_CFLAGS) \
 	-DLIBVA_VERSION_S="\"$(LIBVA_VERSION)\"" \
+	-Wall \
+	-fstack-protector \
 	$(NULL)
 
 vainfo_libs = \

diff --git a/videoprocess/Makefile.am b/videoprocess/Makefile.am
@@ -23,6 +23,8 @@
 bin_PROGRAMS = vavpp
 
 AM_CPPFLAGS = \
+	-Wall					\
+	-fstack-protector			\
 	$(LIBVA_CFLAGS)				\
 	-I$(top_srcdir)/common			\
 	$(NULL)
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ noinst_PROGRAMS = svctenc @@
     AM_CPPFLAGS = \
     	-Wall				\
+    	-fstack-protector		\
     	$(LIBVA_CFLAGS) 		\
     	$(NULL)
@@ Expand Down @@