From 25e8adb631df325607216ad6f3d6638442d9f453 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Mon, 20 Apr 2015 15:33:05 +0530 Subject: Resolved warnings and fixed alignment of few assemblies Resolved warnings seen in x86 modules Fixed alignment of few modules Updated comments in few arm modules for consistency Fixed warnings seen in clang build Change-Id: I0623169b5e84a6a6f09c3d2212e754101272f5e9 --- test/encoder/main.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/encoder/main.c b/test/encoder/main.c index 2a9635d..bb9cabf 100644 --- a/test/encoder/main.c +++ b/test/encoder/main.c @@ -29,7 +29,10 @@ #include #include #include + +#ifndef IOS #include +#endif #ifdef WINDOWS_TIMER #include "windows.h" @@ -1989,7 +1992,7 @@ void synchronous_encode(iv_obj_t *ps_enc, app_ctxt_t *ps_app_ctxt) /* 20 11 2013 100189 Initial Version */ /*****************************************************************************/ #ifdef IOS -int h264enc_main(char * homedir) +int h264enc_main(char * homedir,char *documentdir, int screen_wd, int screen_ht) #else int main(int argc, char *argv[]) #endif @@ -2036,6 +2039,9 @@ int main(int argc, char *argv[]) strcpy(ac_cfg_fname, argv[1]); } +#else + strcpy(ac_cfg_fname, "test.cfg"); + #endif /*************************************************************************/ @@ -2406,22 +2412,22 @@ int main(int argc, char *argv[]) #ifdef IOS /* Correct file paths */ - sprintf(filename_with_path, "%s/%s", homedir, s_app_ctxt.ac_ip_fname); + sprintf(filename_with_path, "%s/%s", documentdir, s_app_ctxt.ac_ip_fname); strcpy (s_app_ctxt.ac_ip_fname, filename_with_path); - sprintf(filename_with_path, "%s/%s", homedir, s_app_ctxt.ac_op_fname); + sprintf(filename_with_path, "%s/%s", documentdir, s_app_ctxt.ac_op_fname); strcpy (s_app_ctxt.ac_op_fname, filename_with_path); - sprintf(filename_with_path, "%s/%s", homedir, s_app_ctxt.ac_recon_fname); + sprintf(filename_with_path, "%s/%s", documentdir, s_app_ctxt.ac_recon_fname); strcpy (s_app_ctxt.ac_recon_fname, filename_with_path); - sprintf(filename_with_path, "%s/%s", homedir, s_app_ctxt.ac_chksum_fname); + sprintf(filename_with_path, "%s/%s", documentdir, s_app_ctxt.ac_chksum_fname); strcpy (s_app_ctxt.ac_chksum_fname, filename_with_path); - sprintf(filename_with_path, "%s/%s", homedir, s_app_ctxt.ac_mb_info_fname); + sprintf(filename_with_path, "%s/%s", documentdir, s_app_ctxt.ac_mb_info_fname); strcpy (s_app_ctxt.ac_mb_info_fname, filename_with_path); - sprintf(filename_with_path, "%s/%s", homedir, s_app_ctxt.ac_pic_info_fname); + sprintf(filename_with_path, "%s/%s", documentdir, s_app_ctxt.ac_pic_info_fname); strcpy (s_app_ctxt.ac_pic_info_fname, filename_with_path); #endif -- cgit v1.2.3