diff options
| author | Cheng Chen <chengchen@google.com> | 2020-01-27 22:14:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-27 22:14:57 +0000 |
| commit | a6ff3abbe631e6d8805714e1534a421e52404509 (patch) | |
| tree | da224199acb04b8f1cf2e4e2863cc0e6c8e6aac4 /vp9/encoder | |
| parent | 4254ecaa075e672b66b9d723ebdd3d7ed7125055 (diff) | |
| parent | c2b223406201b4fc32db77c5d797c228629ec28c (diff) | |
| download | libvpx-a6ff3abbe631e6d8805714e1534a421e52404509.tar libvpx-a6ff3abbe631e6d8805714e1534a421e52404509.tar.gz libvpx-a6ff3abbe631e6d8805714e1534a421e52404509.tar.bz2 libvpx-a6ff3abbe631e6d8805714e1534a421e52404509.zip | |
Merge "Pass partition info to encode frame result"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 7 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 131c3c950..04533f973 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -7229,6 +7229,9 @@ static void update_encode_frame_result( const YV12_BUFFER_CONFIG *source_frame, const YV12_BUFFER_CONFIG *coded_frame, int quantize_index, uint32_t bit_depth, uint32_t input_bit_depth, const FRAME_COUNTS *counts, +#if CONFIG_RATE_CTRL + const PARTITION_INFO *partition_info, +#endif // CONFIG_RATE_CTRL ENCODE_FRAME_RESULT *encode_frame_result) { #if CONFIG_RATE_CTRL PSNR_STATS psnr; @@ -7243,6 +7246,7 @@ static void update_encode_frame_result( encode_frame_result->psnr = psnr.psnr[0]; encode_frame_result->sse = psnr.sse[0]; copy_frame_counts(counts, &encode_frame_result->frame_counts); + encode_frame_result->partition_info = partition_info; #else // CONFIG_RATE_CTRL (void)bit_depth; (void)input_bit_depth; @@ -7551,6 +7555,9 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, cpi->twopass.gf_group.update_type[cpi->twopass.gf_group.index], cpi->Source, get_frame_new_buffer(cm), vp9_get_quantizer(cpi), cpi->oxcf.input_bit_depth, cm->bit_depth, cpi->td.counts, +#if CONFIG_RATE_CTRL + cpi->partition_info, +#endif // CONFIG_RATE_CTRL encode_frame_result); vp9_twopass_postencode_update(cpi); } else if (cpi->use_svc) { diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 731687549..8d7872911 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -895,6 +895,7 @@ typedef struct ENCODE_FRAME_RESULT { double psnr; uint64_t sse; FRAME_COUNTS frame_counts; + const PARTITION_INFO *partition_info; #endif // CONFIG_RATE_CTRL int quantize_index; } ENCODE_FRAME_RESULT; |