[FFmpeg-devel] hqx codec patch: faster decode with multi threaded decoding of slices; fixed clipping bug

[Michael Niedermayer]

On Tue, Apr 07, 2015 at 03:49:09PM +0200, Ferdinand Oeinck wrote:
> From e750ddd8b1b79cfad04f2cdd58b5ba438390adf1 Mon Sep 17 00:00:00 2001
> From: fo <ferdo at bigroses.nl>
> Date: Mon, 6 Apr 2015 15:47:14 +0200
> Subject: [PATCH 1/2] libavcodec/hqx: made decoding multi threaded!
> 
> ---
> libavcodec/hqx.c | 142
> +++++++++++++++++++++++++++++++++++--------------------
> libavcodec/hqx.h |   9 +++-
> 2 files changed, 99 insertions(+), 52 deletions(-)
> 
> diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
> index d7e605f..ee851ed 100644
> --- a/libavcodec/hqx.c
> +++ b/libavcodec/hqx.c
> @@ -39,7 +39,7 @@ enum HQXFormat {
> 
> #define HQX_HEADER_SIZE 59
> 
> -typedef int (*mb_decode_func)(HQXContext *ctx, AVFrame *pic,
> +typedef int (*mb_decode_func)(HQXContext *ctx, slice_data_t *
> slice_data, AVFrame *pic,
>                               GetBitContext *gb, int x, int y);
> 
> /* macroblock selects a group of 4 possible quants and
> @@ -260,7 +260,7 @@ static int decode_block(GetBitContext *gb, VLC *vlc,
>     return 0;
> }
> 
> -static int hqx_decode_422(HQXContext *ctx, AVFrame *pic,
> +static int hqx_decode_422(HQXContext *ctx, slice_data_t *
> slice_data, AVFrame *pic,
>                           GetBitContext *gb, int x, int y)
> {
>     const int *quants;
> @@ -280,20 +280,20 @@ static int hqx_decode_422(HQXContext *ctx,
> AVFrame *pic,
>         if (i == 0 || i == 4 || i == 6)
>             last_dc = 0;
>         ret = decode_block(gb, &ctx->dc_vlc[vlc_index], quants,
> -                           ctx->dcb, ctx->block[i], &last_dc);
> +                           ctx->dcb, slice_data->block[i], &last_dc);
>         if (ret < 0)
>             return ret;
>     }
> 
> -    put_blocks(pic, 0, x,      y, flag, ctx->block[0],
> ctx->block[2], hqx_quant_luma);
> -    put_blocks(pic, 0, x + 8,  y, flag, ctx->block[1],
> ctx->block[3], hqx_quant_luma);
> -    put_blocks(pic, 2, x >> 1, y, flag, ctx->block[4],
> ctx->block[5], hqx_quant_chroma);
> -    put_blocks(pic, 1, x >> 1, y, flag, ctx->block[6],
> ctx->block[7], hqx_quant_chroma);
> +    put_blocks(pic, 0, x, y, flag, slice_data->block[0],
> slice_data->block[2], hqx_quant_luma);
> +    put_blocks(pic, 0, x + 8, y, flag, slice_data->block[1],
> slice_data->block[3], hqx_quant_luma);
> +    put_blocks(pic, 2, x >> 1, y, flag, slice_data->block[4],
> slice_data->block[5], hqx_quant_chroma);
> +    put_blocks(pic, 1, x >> 1, y, flag, slice_data->block[6],
> slice_data->block[7], hqx_quant_chroma);

this appears to be corrupted by linebreaks

Applying: hqx codec patch: faster decode with multi threaded decoding of slices; fixed clipping bug
fatal: corrupt patch at line 13
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 hqx codec patch: faster decode with multi threaded decoding of slices; fixed clipping bug
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

DNS cache poisoning attacks, popular search engine, Google internet authority
dont be evil, please
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150408/2f53afb9/attachment.asc>