diff options
| author | Jerome Jiang <jianj@google.com> | 2018-01-24 01:12:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-24 01:12:44 +0000 |
| commit | dcbe6750e10f4281e5d50309dae98dbaf6169fea (patch) | |
| tree | aa59e4e3ad8531875683d09164ef14fdd1b2bdf8 /vp9/vp9_cx_iface.c | |
| parent | 6ee88546c09d777ca971f47a2f1216d6c5946929 (diff) | |
| parent | 2c2fea2c5bab1761de6ad36c93e030a395a3e77e (diff) | |
| download | libvpx-dcbe6750e10f4281e5d50309dae98dbaf6169fea.tar libvpx-dcbe6750e10f4281e5d50309dae98dbaf6169fea.tar.gz libvpx-dcbe6750e10f4281e5d50309dae98dbaf6169fea.tar.bz2 libvpx-dcbe6750e10f4281e5d50309dae98dbaf6169fea.zip | |
Merge "Fix frame sizes in pkt to support spatial layers."
Diffstat (limited to 'vp9/vp9_cx_iface.c')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index cdfb0336b..28cfcdeb1 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1233,6 +1233,8 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx, ctx->pending_frame_magnitude |= size; cx_data += size; cx_data_sz -= size; + pkt.data.frame.width[cpi->svc.spatial_layer_id] = cpi->common.width; + pkt.data.frame.height[cpi->svc.spatial_layer_id] = cpi->common.height; if (ctx->output_cx_pkt_cb.output_cx_pkt) { pkt.kind = VPX_CODEC_CX_FRAME_PKT; @@ -1259,8 +1261,8 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx, pkt.data.frame.duration = (unsigned long)ticks_to_timebase_units( timebase, dst_end_time_stamp - dst_time_stamp); pkt.data.frame.flags = get_frame_pkt_flags(cpi, lib_flags); - pkt.data.frame.width = cpi->common.width; - pkt.data.frame.height = cpi->common.height; + pkt.data.frame.width[cpi->svc.spatial_layer_id] = cpi->common.width; + pkt.data.frame.height[cpi->svc.spatial_layer_id] = cpi->common.height; if (ctx->pending_cx_data) { if (size) ctx->pending_frame_sizes[ctx->pending_frame_count++] = size; |