hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Update usage information and version string.

Browse source 
- Change stderr back to text mode. Can't see what harm it should allow us to print
  correct newlines for different platforms.
- Remove copy-pasted function calls from usage printing.
This commit is contained in:
Ari Koivula 2014-02-05 19:16:44 +02:00
parent 355340067f
commit 1d730bd248
3 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
README.md
View file

@ -11,6 +11,21 @@ http://ultravideo.cs.tut.fi/#encoder for more information.
Currently most of the features are turned on/off from the code on compile time, but they are
meant to be user configurable later.
Usage:
hevc_encoder -i <input> -w <width> -h <height> -o <output>
Optional parameters:
-n, --frames <integer> : number of frames to decode
-q, --qp <integer> : Quantization Parameter, default 32
-p, --period <integer> : Period of intra pictures, default 0
0: only first picture is intra
1: all pictures are intra
2-N: every Nth picture is intra
--no-deblock : Disable deblocking filter
--deblock <beta:tc> : Deblocking filter parameters
--no-sao : Disable sample adaptive offset
Example:
kvazaar -i <INPUT_YUV> -w <WIDTH> -h <HEIGHT> -o <OUTPUT.BIN> -n <NUMBER_OF_FRAMES> -q <QP>
eg. `kvazaar -i BQMall_832x480_60.yuv -w 832 -h 480 -o out.bin -n 600 -q 32`

46
src/encmain.c
View file

@ -20,13 +20,6 @@
/*
* \file
*
* TODO: Check that these usage instructions are correct.
* \subsection options_subsec All program options:
* - -i <filename>: input
* - -o <filename>: output
* - -w <width>: frame width
* - -h <height>: frame height
* - -n <n>: encode only n frames
*/
#ifdef _WIN32
@ -74,11 +67,12 @@ int main(int argc, char *argv[])
FILE *recout = fopen("encrec_832x480_60.yuv","wb"); //!< reconstructed YUV output (only on debug mode)
#endif
// Windows needs all of the standard in/outputs to be set to _O_BINARY
// Stdin and stdout need to be binary for input and output to work.
// Stderr needs to be text mode to convert \n to \r\n in Windows.
#ifdef _WIN32
_setmode( _fileno( stdin ), _O_BINARY );
_setmode( _fileno( stdout ), _O_BINARY );
_setmode( _fileno( stderr ), _O_BINARY );
_setmode( _fileno( stderr ), _O_TEXT );
#endif
// Handle configuration
@ -86,23 +80,25 @@ int main(int argc, char *argv[])
// If problem with configuration, print banner and shutdown
if (!cfg || !config_init(cfg) || !config_read(cfg,argc,argv)) {
fprintf(stderr, "/***********************************************/\r\n");
fprintf(stderr, " * Kvazaar HEVC Encoder v. " VERSION_STRING "*\r\n");
fprintf(stderr, " * Tampere University of Technology 2014 *\r\n");
fprintf(stderr, "/***********************************************/\r\n\r\n");
fprintf(stderr,
"/***********************************************/\n"
" * Kvazaar HEVC Encoder v. " VERSION_STRING "*\n"
" * Tampere University of Technology 2014 *\n"
"/***********************************************/\n\n");
fprintf(stderr, "Usage:\r\n");
fprintf(stderr, "hevc_encoder -i <input> -w <width> -h <height> -o <output>\r\n");
fprintf(stderr, "Optional parameters:\r\n");
fprintf(stderr, " -n, --frames <integer> : number of frames to decode\r\n");
fprintf(stderr, " -q, --qp <integer> : Quantization Parameter, default 32\r\n");
fprintf(stderr, " -p, --period <integer> : Period of intra pictures, default 0\r\n");
fprintf(stderr, " 0: only first picture is intra\r\n");
fprintf(stderr, " 1: all pictures are intra\r\n");
fprintf(stderr, " 2-N: every Nth picture is intra\r\n");
fprintf(stderr, " --no-deblock : Disable deblocking filter\r\n");
fprintf(stderr, " --deblock <beta:tc> : Deblocking filter parameters\r\n");
fprintf(stderr, " --no-sao : Disable sample adaptive offset\r\n");
fprintf(stderr,
"Usage:\n"
"hevc_encoder -i <input> -w <width> -h <height> -o <output>\n"
"Optional parameters:\n"
" -n, --frames <integer> : number of frames to decode\n"
" -q, --qp <integer> : Quantization Parameter, default 32\n"
" -p, --period <integer> : Period of intra pictures, default 0\n"
" 0: only first picture is intra\n"
" 1: all pictures are intra\n"
" 2-N: every Nth picture is intra\n"
" --no-deblock : Disable deblocking filter\n"
" --deblock <beta:tc> : Deblocking filter parameters\n"
" --no-sao : Disable sample adaptive offset\n");
if (cfg)
config_destroy(cfg);

2
src/global.h
View file

@ -108,7 +108,7 @@ typedef int16_t coefficient;
//#define SIGN3(x) ((x) > 0) ? +1 : ((x) == 0 ? 0 : -1)
#define SIGN3(x) (((x) > 0) - ((x) < 0))
#define VERSION_STRING "0.2 "
#define VERSION_STRING "0.2.3 "
#define VERSION 0.2
//#define VERBOSE 1