diff options
| author | Minghai Shang <minghai@google.com> | 2014-09-12 10:52:42 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-12 10:52:42 -0700 |
| commit | 3e7b04af54e9133c94527aa970b398c009adcbef (patch) | |
| tree | c4b4553b341257ad646154ea91ffc44d28203f8e /vp9/encoder | |
| parent | 7f77a1c3c96ec582fa6b8682320d60fb389be94b (diff) | |
| parent | e3fff31aff4f6be8aad493bc954f60ad5cc2f8f5 (diff) | |
| download | libvpx-3e7b04af54e9133c94527aa970b398c009adcbef.tar libvpx-3e7b04af54e9133c94527aa970b398c009adcbef.tar.gz libvpx-3e7b04af54e9133c94527aa970b398c009adcbef.tar.bz2 libvpx-3e7b04af54e9133c94527aa970b398c009adcbef.zip | |
Merge "[spatial svc] Output psnr for all layers in one packet."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 627bff68a..b3884d056 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -1280,7 +1280,10 @@ static void generate_psnr_packet(VP9_COMP *cpi) { pkt.data.psnr.psnr[i] = psnr.psnr[i]; } pkt.kind = VPX_CODEC_PSNR_PKT; - vpx_codec_pkt_list_add(cpi->output_pkt_list, &pkt); + if (is_two_pass_svc(cpi)) + cpi->svc.layer_context[cpi->svc.spatial_layer_id].psnr_pkt = pkt.data.psnr; + else + vpx_codec_pkt_list_add(cpi->output_pkt_list, &pkt); } int vp9_use_as_reference(VP9_COMP *cpi, int ref_frame_flags) { diff --git a/vp9/encoder/vp9_svc_layercontext.h b/vp9/encoder/vp9_svc_layercontext.h index 1fc43a427..d180d1a8c 100644 --- a/vp9/encoder/vp9_svc_layercontext.h +++ b/vp9/encoder/vp9_svc_layercontext.h @@ -36,6 +36,7 @@ typedef struct { int gold_ref_idx; int has_alt_frame; size_t layer_size; + struct vpx_psnr_pkt psnr_pkt; } LAYER_CONTEXT; typedef struct { |