[FFmpeg-devel] [PATCH] h264: integrate clear_blocks calls with IDCT.

[Michael Niedermayer]

On Sat, Feb 16, 2013 at 11:19:33AM -0800, Ronald S. Bultje wrote:
> From: "Ronald S. Bultje" <rsbultje at gmail.com>
> 
> The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700
> to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb
> (in the decode_slice loop) goes from 1759 to 1733 cycles on the clip
> tested (cathedral), i.e. almost 30 cycles per mb faster.
> 
> Arm assembly changes untested.
> ---
>  libavcodec/arm/h264idct_neon.S     |  20 +++++--
>  libavcodec/h264.c                  |  14 ++---
>  libavcodec/h264_mb_template.c      |  11 +---
>  libavcodec/h264addpx_template.c    |   4 ++
>  libavcodec/h264dsp.c               |   4 +-
>  libavcodec/h264dsp.h               |   4 +-
>  libavcodec/h264idct_template.c     |  16 ++++--
>  libavcodec/h264pred.h              |   8 +--
>  libavcodec/h264pred_template.c     |  28 ++++++----
>  libavcodec/ppc/h264_altivec.c      |   3 ++
>  libavcodec/svq3.c                  |   2 +
>  libavcodec/x86/h264_idct.asm       | 108 ++++++++++++++++++++++++++++---------
>  libavcodec/x86/h264_idct_10bit.asm |  53 ++++++++++++++++--
>  13 files changed, 202 insertions(+), 73 deletions(-)

Doesnt apply, git also cant fallback to a 3way merge for this due to
it not hvaing the h264.c that was prior to this patch

Applying: h264: integrate clear_blocks calls with IDCT.
fatal: sha1 information is lacking or useless (libavcodec/h264.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 h264: integrate clear_blocks calls with IDCT.

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

The real ebay dictionary, page 2
"100% positive feedback" - "All either got their money back or didnt complain"
"Best seller ever, very honest" - "Seller refunded buyer after failed scam"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130216/7d67382f/attachment.asc>