Commit 955b35d9 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Cleaning up vpx_codec_get_cx_data() function.

Change-Id: I1cd7f0502a28dfe65449ff04d70498b2e92c3823
parent d805b39d
...@@ -255,8 +255,8 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx, ...@@ -255,8 +255,8 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx,
} }
const vpx_codec_cx_pkt_t *vpx_codec_get_cx_data(vpx_codec_ctx_t *ctx, const vpx_codec_cx_pkt_t *vpx_codec_get_cx_data(vpx_codec_ctx_t *ctx,
vpx_codec_iter_t *iter) { vpx_codec_iter_t *iter) {
const vpx_codec_cx_pkt_t *pkt = NULL; const vpx_codec_cx_pkt_t *pkt = NULL;
if (ctx) { if (ctx) {
...@@ -271,32 +271,30 @@ const vpx_codec_cx_pkt_t *vpx_codec_get_cx_data(vpx_codec_ctx_t *ctx, ...@@ -271,32 +271,30 @@ const vpx_codec_cx_pkt_t *vpx_codec_get_cx_data(vpx_codec_ctx_t *ctx,
} }
if (pkt && pkt->kind == VPX_CODEC_CX_FRAME_PKT) { if (pkt && pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
/* If the application has specified a destination area for the // If the application has specified a destination area for the
* compressed data, and the codec has not placed the data there, // compressed data, and the codec has not placed the data there,
* and it fits, copy it. // and it fits, copy it.
*/ vpx_codec_priv_t *const priv = ctx->priv;
char *dst_buf = ctx->priv->enc.cx_data_dst_buf.buf; char *const dst_buf = (char *)priv->enc.cx_data_dst_buf.buf;
if (dst_buf if (dst_buf &&
&& pkt->data.raw.buf != dst_buf pkt->data.raw.buf != dst_buf &&
&& pkt->data.raw.sz pkt->data.raw.sz + priv->enc.cx_data_pad_before +
+ ctx->priv->enc.cx_data_pad_before priv->enc.cx_data_pad_after <= priv->enc.cx_data_dst_buf.sz) {
+ ctx->priv->enc.cx_data_pad_after vpx_codec_cx_pkt_t *modified_pkt = &priv->enc.cx_data_pkt;
<= ctx->priv->enc.cx_data_dst_buf.sz) {
vpx_codec_cx_pkt_t *modified_pkt = &ctx->priv->enc.cx_data_pkt; memcpy(dst_buf + priv->enc.cx_data_pad_before, pkt->data.raw.buf,
pkt->data.raw.sz);
memcpy(dst_buf + ctx->priv->enc.cx_data_pad_before,
pkt->data.raw.buf, pkt->data.raw.sz);
*modified_pkt = *pkt; *modified_pkt = *pkt;
modified_pkt->data.raw.buf = dst_buf; modified_pkt->data.raw.buf = dst_buf;
modified_pkt->data.raw.sz += ctx->priv->enc.cx_data_pad_before modified_pkt->data.raw.sz += priv->enc.cx_data_pad_before +
+ ctx->priv->enc.cx_data_pad_after; priv->enc.cx_data_pad_after;
pkt = modified_pkt; pkt = modified_pkt;
} }
if (dst_buf == pkt->data.raw.buf) { if (dst_buf == pkt->data.raw.buf) {
ctx->priv->enc.cx_data_dst_buf.buf = dst_buf + pkt->data.raw.sz; priv->enc.cx_data_dst_buf.buf = dst_buf + pkt->data.raw.sz;
ctx->priv->enc.cx_data_dst_buf.sz -= pkt->data.raw.sz; priv->enc.cx_data_dst_buf.sz -= pkt->data.raw.sz;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment