diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 00:58:04 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 00:58:04 +0400 |
commit | 32da2fd422651f1f36f26975685cb7f7ff5a678b (patch) | |
tree | 875a560658191a7a11a660d8c1a3ff0d76799ef1 /libavcodec | |
parent | 82c742377a168c0a6eb7c34f7c321acdf25036e0 (diff) | |
parent | 1df0b061621b10edde87e3ab7ea83aed381c574f (diff) |
Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
nuv: Reuse the DSPContext from RTJpegContext
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/nuv.c | 12 | ||||
-rw-r--r-- | libavcodec/rtjpeg.c | 29 | ||||
-rw-r--r-- | libavcodec/rtjpeg.h | 9 |
3 files changed, 27 insertions, 23 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index c01d6264ba..31ab1a95e8 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -41,7 +41,6 @@ typedef struct { unsigned char *decomp_buf; uint32_t lq[64], cq[64]; RTJpegContext rtj; - DSPContext dsp; } NuvContext; static const uint8_t fallback_lquant[] = { @@ -139,13 +138,11 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, "Can't allocate decompression buffer.\n"); return AVERROR(ENOMEM); } - ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, - c->lq, c->cq); + ff_rtjpeg_decode_init(&c->rtj, c->width, c->height, c->lq, c->cq); av_frame_unref(c->pic); return 1; } else if (quality != c->quality) - ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, - c->lq, c->cq); + ff_rtjpeg_decode_init(&c->rtj, c->width, c->height, c->lq, c->cq); return 0; } @@ -184,8 +181,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ret = get_quant(avctx, c, buf, buf_size); if (ret < 0) return ret; - ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, - c->cq); + ff_rtjpeg_decode_init(&c->rtj, c->width, c->height, c->lq, c->cq); return orig_size; } @@ -323,7 +319,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (avctx->extradata_size) get_quant(avctx, c, avctx->extradata, avctx->extradata_size); - ff_dsputil_init(&c->dsp, avctx); + ff_rtjpeg_init(&c->rtj, avctx); if ((ret = codec_reinit(avctx, avctx->width, avctx->height, -1)) < 0) return ret; diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c index 860d95821d..e67ba7565d 100644 --- a/libavcodec/rtjpeg.c +++ b/libavcodec/rtjpeg.c @@ -121,7 +121,7 @@ int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, if (res < 0) \ return res; \ if (res > 0) \ - c->dsp->idct_put(dst, stride, block); \ + c->dsp.idct_put(dst, stride, block); \ } while (0) int16_t *block = c->block; BLOCK(c->lquant, y1, f->linesize[0]); @@ -148,7 +148,6 @@ int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, /** * @brief initialize an RTJpegContext, may be called multiple times * @param c context to initialize - * @param dsp specifies the idct to use for decoding * @param width width of image, will be rounded down to the nearest multiple * of 16 for decoding * @param height height of image, will be rounded down to the nearest multiple @@ -156,21 +155,29 @@ int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, * @param lquant luma quantization table to use * @param cquant chroma quantization table to use */ -void ff_rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp, - int width, int height, +void ff_rtjpeg_decode_init(RTJpegContext *c, int width, int height, const uint32_t *lquant, const uint32_t *cquant) { int i; - c->dsp = dsp; for (i = 0; i < 64; i++) { - int z = ff_zigzag_direct[i]; - int p = c->dsp->idct_permutation[i]; - z = ((z << 3) | (z >> 3)) & 63; // rtjpeg uses a transposed variant - - // permute the scan and quantization tables for the chosen idct - c->scan[i] = c->dsp->idct_permutation[z]; + int p = c->dsp.idct_permutation[i]; c->lquant[p] = lquant[i]; c->cquant[p] = cquant[i]; } c->w = width; c->h = height; } + +void ff_rtjpeg_init(RTJpegContext *c, AVCodecContext *avctx) +{ + int i; + + ff_dsputil_init(&c->dsp, avctx); + + for (i = 0; i < 64; i++) { + int z = ff_zigzag_direct[i]; + z = ((z << 3) | (z >> 3)) & 63; // rtjpeg uses a transposed variant + + // permute the scan and quantization tables for the chosen idct + c->scan[i] = c->dsp.idct_permutation[z]; + } +} diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h index 294b06c697..3be4cfcad2 100644 --- a/libavcodec/rtjpeg.h +++ b/libavcodec/rtjpeg.h @@ -31,16 +31,17 @@ typedef struct RTJpegContext { int w, h; - DSPContext *dsp; + DSPContext dsp; uint8_t scan[64]; uint32_t lquant[64]; uint32_t cquant[64]; DECLARE_ALIGNED(16, int16_t, block)[64]; } RTJpegContext; -void ff_rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp, - int width, int height, - const uint32_t *lquant, const uint32_t *cquant); +void ff_rtjpeg_init(RTJpegContext *c, AVCodecContext *avctx); + +void ff_rtjpeg_decode_init(RTJpegContext *c, int width, int height, + const uint32_t *lquant, const uint32_t *cquant); int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, const uint8_t *buf, int buf_size); |