diff options
Diffstat (limited to 'test')
| -rw-r--r--[-rwxr-xr-x] | test/Android.mk | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/decoder.mk | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/decoder/main.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder.mk | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/app.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/input.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/main.c | 20 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/output.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/psnr.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/psnr.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/encoder/recon.c | 0 |
11 files changed, 13 insertions, 7 deletions
diff --git a/test/Android.mk b/test/Android.mk index 0085832..0085832 100755..100644 --- a/test/Android.mk +++ b/test/Android.mk diff --git a/test/decoder.mk b/test/decoder.mk index 1a49a92..1a49a92 100755..100644 --- a/test/decoder.mk +++ b/test/decoder.mk diff --git a/test/decoder/main.c b/test/decoder/main.c index 0076ce9..0076ce9 100755..100644 --- a/test/decoder/main.c +++ b/test/decoder/main.c diff --git a/test/encoder.mk b/test/encoder.mk index 9a0980e..9a0980e 100755..100644 --- a/test/encoder.mk +++ b/test/encoder.mk diff --git a/test/encoder/app.h b/test/encoder/app.h index 7c16fcd..7c16fcd 100755..100644 --- a/test/encoder/app.h +++ b/test/encoder/app.h diff --git a/test/encoder/input.c b/test/encoder/input.c index c292612..c292612 100755..100644 --- a/test/encoder/input.c +++ b/test/encoder/input.c diff --git a/test/encoder/main.c b/test/encoder/main.c index 2a9635d..bb9cabf 100755..100644 --- a/test/encoder/main.c +++ b/test/encoder/main.c @@ -29,7 +29,10 @@ #include <assert.h> #include <string.h> #include <sys/time.h> + +#ifndef IOS #include <malloc.h> +#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 diff --git a/test/encoder/output.c b/test/encoder/output.c index e0f27dd..e0f27dd 100755..100644 --- a/test/encoder/output.c +++ b/test/encoder/output.c diff --git a/test/encoder/psnr.c b/test/encoder/psnr.c index c9bb6a1..c9bb6a1 100755..100644 --- a/test/encoder/psnr.c +++ b/test/encoder/psnr.c diff --git a/test/encoder/psnr.h b/test/encoder/psnr.h index fd388cf..fd388cf 100755..100644 --- a/test/encoder/psnr.h +++ b/test/encoder/psnr.h diff --git a/test/encoder/recon.c b/test/encoder/recon.c index 7fd0f5c..7fd0f5c 100755..100644 --- a/test/encoder/recon.c +++ b/test/encoder/recon.c |