diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:44:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:44:53 +0200 |
| commit | f2a581e2eeecf85c0e58e1a4bea905d717807045 (patch) | |
| tree | 51f776a1ccfcb056079464da07a947cc36718310 /libavcodec/proresenc_kostya.c | |
| parent | a99f0ad194fd48ae8afd9264595b7ca6f45e2a8a (diff) | |
| parent | 05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024 (diff) | |
| download | ffmpeg-f2a581e2eeecf85c0e58e1a4bea905d717807045.tar.gz | |
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
proresenc: Do not entangle coded_frame
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/proresenc_kostya.c')
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 18413681f6..1abc496b3f 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -199,6 +199,7 @@ typedef struct ProresContext { int linesize, int16_t *block); FDCTDSPContext fdsp; + const AVFrame *pic; int mb_width, mb_height; int mbs_per_slice; int num_chroma_blocks, chroma_factor; @@ -745,7 +746,7 @@ static int estimate_alpha_plane(ProresContext *ctx, int *error, return bits; } -static int find_slice_quant(AVCodecContext *avctx, const AVFrame *pic, +static int find_slice_quant(AVCodecContext *avctx, int trellis_node, int x, int y, int mbs_per_slice, ProresThreadData *td) { @@ -767,7 +768,7 @@ static int find_slice_quant(AVCodecContext *avctx, const AVFrame *pic, if (ctx->pictures_per_frame == 1) line_add = 0; else - line_add = ctx->cur_picture_idx ^ !pic->top_field_first; + line_add = ctx->cur_picture_idx ^ !ctx->pic->top_field_first; mbs = x + mbs_per_slice; for (i = 0; i < ctx->num_planes; i++) { @@ -787,9 +788,9 @@ static int find_slice_quant(AVCodecContext *avctx, const AVFrame *pic, pwidth = avctx->width >> 1; } - linesize[i] = pic->linesize[i] * ctx->pictures_per_frame; - src = (const uint16_t*)(pic->data[i] + yp * linesize[i] + - line_add * pic->linesize[i]) + xp; + linesize[i] = ctx->pic->linesize[i] * ctx->pictures_per_frame; + src = (const uint16_t *)(ctx->pic->data[i] + yp * linesize[i] + + line_add * ctx->pic->linesize[i]) + xp; if (i < 3) { get_slice_data(ctx, src, linesize[i], xp, yp, @@ -912,7 +913,7 @@ static int find_quant_thread(AVCodecContext *avctx, void *arg, for (x = mb = 0; x < ctx->mb_width; x += mbs_per_slice, mb++) { while (ctx->mb_width - x < mbs_per_slice) mbs_per_slice >>= 1; - q = find_slice_quant(avctx, arg, + q = find_slice_quant(avctx, (mb + 1) * TRELLIS_WIDTH, x, y, mbs_per_slice, td); } @@ -940,6 +941,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int max_slice_size = (ctx->frame_size_upper_bound - 200) / (ctx->pictures_per_frame * ctx->slices_per_picture + 1); uint8_t frame_flags; + ctx->pic = pic; pkt_size = ctx->frame_size_upper_bound; if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size + FF_MIN_BUFFER_SIZE)) < 0) |