RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffprobe: avoid unnecessary pow and exp2 calls 

These are just for prefixes and may be hardcoded easily; see lavu/eval
for this approach.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
Ganesh Ajjanagadde 2015-12-23 09:49:00 -08:00
parent e5c16e38fe
commit 4a44bc5588
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ffprobe.c
View File

@ -218,8 +218,19 @@ static AVInputFormat *iformat = NULL;
static struct AVHashContext *hash; static struct AVHashContext *hash;
static const char *const binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; static const struct {
static const char *const decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; double bin_val;
double dec_val;
const char *bin_str;
const char *dec_str;
} si_prefixes[] = {
{ 1.0, 1.0, "", "" },
{ 1.024e3, 1e3, "Ki", "K" },
{ 1.048576e6, 1e6, "Mi", "M" },
{ 1.073741824e9, 1e9, "Gi", "G" },
{ 1.099511627776e12, 1e12, "Ti", "T" },
{ 1.125899906842624e15, 1e15, "Pi", "P" },
};
static const char unit_second_str[] = "s" ; static const char unit_second_str[] = "s" ;
static const char unit_hertz_str[] = "Hz" ; static const char unit_hertz_str[] = "Hz" ;
@ -273,14 +284,14 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv)
if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) {
index = (long long int) (log2(vald)) / 10; index = (long long int) (log2(vald)) / 10;
index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) - 1); index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1);
vald /= exp2(index * 10); vald /= si_prefixes[index].bin_val;
prefix_string = binary_unit_prefixes[index]; prefix_string = si_prefixes[index].bin_str;
} else { } else {
index = (long long int) (log10(vald)) / 3; index = (long long int) (log10(vald)) / 3;
index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) - 1); index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1);
vald /= pow(10, index * 3); vald /= si_prefixes[index].dec_val;
prefix_string = decimal_unit_prefixes[index]; prefix_string = si_prefixes[index].dec_str;
} }
vali = vald; vali = vald;
} }