generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test gerrit.

Browse Source
This commit is contained in:
wangch 2017-12-05 18:07:21 -05:00
parent 90ce21e519
commit eea111f16a
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vp9/encoder/vp9_encoder.c
View File

@ -5286,6 +5286,21 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
} }
#endif // CONFIG_REALTIME_ONLY #endif // CONFIG_REALTIME_ONLY
#if 1
{
VP9_COMMON *const cm = &cpi->common;
TWO_PASS *const twopass = &cpi->twopass;
GF_GROUP *const gf_group = &twopass->gf_group;
printf("Frame=%d, gf_group_update_type[gf_group_index=%d]=%d, "
"show_frame=%d\n",
cm->current_video_frame, gf_group->index,
gf_group->update_type[gf_group->index],
cm->show_frame);
}
#endif // 0
if (cm->refresh_frame_context) if (cm->refresh_frame_context)
cm->frame_contexts[cm->frame_context_idx] = *cm->fc; cm->frame_contexts[cm->frame_context_idx] = *cm->fc;
@ -5319,6 +5334,13 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
if (oxcf->pass != 1) { if (oxcf->pass != 1) {
double samples = 0.0; double samples = 0.0;
cpi->bytes += (int)(*size); cpi->bytes += (int)(*size);
#if 1
{
printf("Frame %d: rate: %d\n",
cm->current_video_frame, (int)(*size));
}
#endif // 0
if (cm->show_frame) { if (cm->show_frame) {
uint32_t bit_depth = 8; uint32_t bit_depth = 8;
@ -5348,6 +5370,19 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
cpi->total_sq_error += psnr.sse[0]; cpi->total_sq_error += psnr.sse[0];
cpi->total_samples += psnr.samples[0]; cpi->total_samples += psnr.samples[0];
samples = psnr.samples[0]; samples = psnr.samples[0];
#if 1
{
const int rddiv = cpi->rd.RDDIV;
const int rdmult = cpi->rd.RDMULT;
const int64_t rdcost = RDCOST(
rdmult, rddiv, (int)(*size) * 8, psnr.sse[0]);
printf("Frame %d: distortion: %" PRIu64 " rdcost: %" PRId64 "\n",
cm->current_video_frame, psnr.sse[0], rdcost);
printf("%d %d\n", rddiv, rdmult);
}
#endif // 0
{ {
PSNR_STATS psnr2; PSNR_STATS psnr2;

1
vp9/encoder/vp9_firstpass.c
View File

@ -2600,6 +2600,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
#endif #endif
// Set the interval until the next gf. // Set the interval until the next gf.
// rc->baseline_gf_interval = 8;
rc->baseline_gf_interval = i - (is_key_frame || rc->source_alt_ref_pending); rc->baseline_gf_interval = i - (is_key_frame || rc->source_alt_ref_pending);
// Only encode alt reference frame in temporal base layer. So // Only encode alt reference frame in temporal base layer. So