coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

psnr tool - disable -t if openmp not enabled

Browse Source 
BUG=204
TESTED=psnr ?
Review URL: https://webrtc-codereview.appspot.com/1254004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@621 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-03-26 09:06:32 +00:00
parent 25120f2196
commit 036d06c5c5
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 620 Version: 621
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 620 #define LIBYUV_VERSION 621
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

6
util/psnr_main.cc
View File

@ -57,7 +57,9 @@ int num_skip_org = 0;
int num_skip_rec = 0; int num_skip_rec = 0;
int num_frames = 0; int num_frames = 0;
int do_yscale = 0; int do_yscale = 0;
#ifdef _OPENMP
int num_threads = 0; int num_threads = 0;
#endif
bool ExtractResolutionFromYuvFilename(const char *name, bool ExtractResolutionFromYuvFilename(const char *name,
int* width_ptr, int* width_ptr,
@ -115,7 +117,9 @@ void PrintHelp(const char * program) {
printf(" -swap .................. Swap U and V plane\n"); printf(" -swap .................. Swap U and V plane\n");
printf(" -skip <org> <rec> ...... Number of frame to skip of org and rec\n"); printf(" -skip <org> <rec> ...... Number of frame to skip of org and rec\n");
printf(" -frames <num> .......... Number of frames to compare\n"); printf(" -frames <num> .......... Number of frames to compare\n");
#ifdef _OPENMP
printf(" -t <num> ............... Number of threads\n"); printf(" -t <num> ............... Number of threads\n");
#endif
printf(" -yscale ................ Scale org Y values of 16..240 to 0..255\n"); printf(" -yscale ................ Scale org Y values of 16..240 to 0..255\n");
printf(" -n ..................... Show file name\n"); printf(" -n ..................... Show file name\n");
printf(" -v ..................... verbose++\n"); printf(" -v ..................... verbose++\n");
@ -156,8 +160,10 @@ void ParseOptions(int argc, const char *argv[]) {
num_skip_rec = atoi(argv[++c]); // NOLINT num_skip_rec = atoi(argv[++c]); // NOLINT
} else if (!strcmp(argv[c], "-frames") && c + 1 < argc) { } else if (!strcmp(argv[c], "-frames") && c + 1 < argc) {
num_frames = atoi(argv[++c]); // NOLINT num_frames = atoi(argv[++c]); // NOLINT
#ifdef _OPENMP
} else if (!strcmp(argv[c], "-t") && c + 1 < argc) { } else if (!strcmp(argv[c], "-t") && c + 1 < argc) {
num_threads = atoi(argv[++c]); // NOLINT num_threads = atoi(argv[++c]); // NOLINT
#endif
} else if (fileindex_org == 0) { } else if (fileindex_org == 0) {
fileindex_org = c; fileindex_org = c;
} else if (fileindex_rec == 0) { } else if (fileindex_rec == 0) {