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

Store AVG QP information in encmain

Browse source
This commit is contained in:
Pauli Oikkonen 2019-11-04 17:08:07 +02:00
parent 80575c59bf
commit c7313ce567
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cli.c
View file

@ -30,8 +30,7 @@
#include <string.h>
#include <getopt.h>
#include <ctype.h>
unsigned int sum_of_qps = 0;
unsigned int frames_done = 0;
static const char short_options[] = "i:o:d:w:h:n:q:p:r:";
static const struct option long_options[] = {
{ "input", required_argument, NULL, 'i' },
@ -563,11 +562,9 @@ void print_help(void)
void print_frame_info(const kvz_frame_info *const info,
const double frame_psnr[3],
const uint32_t bytes,
const bool print_psnr)
const bool print_psnr,
const double avg_qp)
{
sum_of_qps += info->qp;
frames_done += 1;
double avg_qp = sum_of_qps / frames_done;
fprintf(stderr, "POC %4d QP %2d AVG QP %.1f (%c-frame) %10d bits",
info->poc,
info->qp,
@ -595,8 +592,3 @@ void print_frame_info(const kvz_frame_info *const info,
fprintf(stderr, "\n");
}
unsigned int return_sum_of_qps()
{
return sum_of_qps;
}

4
src/cli.h
View file

@ -58,7 +58,7 @@ void print_help(void);
void print_frame_info(const kvz_frame_info *const info,
const double frame_psnr[3],
const uint32_t bytes,
const bool print_psnr);
unsigned int return_sum_of_qps();
const bool print_psnr,
const double avg_qp);
#endif

12
src/encmain.c
View file

@ -305,6 +305,10 @@ void output_recon_pictures(const kvz_api *const api,
} while (picture_written);
}
static double calc_avg_qp(uint64_t qp_sum, uint32_t frames_done)
{
return (double)qp_sum / (double)frames_done;
}
/**
* \brief Program main function.
@ -432,6 +436,7 @@ int main(int argc, char *argv[])
uint64_t bitstream_length = 0;
uint32_t frames_done = 0;
double psnr_sum[3] = { 0.0, 0.0, 0.0 };
uint64_t qp_sum = 0;
// how many bits have been written this second? used for checking if framerate exceeds level's limits
uint64_t bits_this_second = 0;
@ -597,12 +602,15 @@ int main(int argc, char *argv[])
opts->config->height);
}
qp_sum += info_out.qp;
frames_done += 1;
psnr_sum[0] += frame_psnr[0];
psnr_sum[1] += frame_psnr[1];
psnr_sum[2] += frame_psnr[2];
print_frame_info(&info_out, frame_psnr, len_out, encoder->cfg.calc_psnr);
print_frame_info(&info_out, frame_psnr, len_out, encoder->cfg.calc_psnr,
calc_avg_qp(qp_sum, frames_done));
}
api->picture_free(cur_in_img);
@ -648,7 +656,7 @@ int main(int argc, char *argv[])
fprintf(stderr, " FPS: %.2f\n", ((double)frames_done)/wall_time);
double bitrate = (bitstream_length * 8 * (double)(encoder->cfg.framerate_num / encoder->cfg.framerate_denom) / 1024 / frames_done / 1024);
fprintf(stderr, " Bitrate: %.3f mbps\n", bitrate);
fprintf(stderr, " AVG QP: %.1f\n", (double)(return_sum_of_qps() /frames_done));
fprintf(stderr, " AVG QP: %.1f\n", calc_avg_qp(qp_sum, frames_done));
}
pthread_join(input_thread, NULL);
}