[FFmpeg-devel] [PATCH] Patch cleanup for MPEG 1 & 2 optimizations

[Michael Niedermayer]

On Mon, Apr 07, 2008 at 04:19:25AM +0200, strites wrote:
> I changed address to use something capable of recognizing text files as
> text files. Sorry for any inconveninece
>
> I changed the patches as signaled by Michael Niedermayer.
>
> -- 
> Keiji Costantini

> >From a774b12176f6d0e7a8226bb6a481882df8441943 Mon Sep 17 00:00:00 2001
> From: strites <strites at gmail.com>
> Date: Mon, 7 Apr 2008 03:01:26 +0200
> Subject: [PATCH] cosmetics
[...]
>              ptr_y = s->edge_emu_buffer;
>              if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
>                  uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
> -                ff_emulated_edge_mc(uvbuf  , ptr_cb, s->uvlinesize, 9, 9+field_based,
> -                                 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
> -                ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
> -                                 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
> +                ff_emulated_edge_mc(uvbuf ,
> +                                    ptr_cb, s->uvlinesize, 9,
> +                                    9+field_based,

That is still spliting block_w/h oddly


[...]

> >From 07a54dae92c3061a472bd2ee884145b0123e8dbf Mon Sep 17 00:00:00 2001
> From: strites <strites at gmail.com>
> Date: Mon, 7 Apr 2008 03:27:33 +0200
> Subject: [PATCH] cosmetics
> 
> ---
>  libavcodec/mpegvideo_common.h |   41 ++++++++++++++++++++++++++++-------------
>  1 files changed, 28 insertions(+), 13 deletions(-)
> 
> diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
> index bb884d4..8370a44 100644
> --- a/libavcodec/mpegvideo_common.h
> +++ b/libavcodec/mpegvideo_common.h

> @@ -514,15 +514,20 @@ static inline void qpel_motion(MpegEncContext *s,
>  
>      if(   (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16
>         || (unsigned)src_y >    v_edge_pos - (motion_y&3) - h  ){
> -        ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
> -                         src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
> +        ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17,
> +                            17+field_based, src_x, src_y<<field_based,
> +                            s->h_edge_pos, s->v_edge_pos);

This also splits block_w/h oddly.


>          ptr_y= s->edge_emu_buffer;
>          if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
>              uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize;
> -            ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based,
> -                             uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
> -            ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based,
> -                             uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
> +            ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9,
> +                                9 + field_based,
> +                                uvsrc_x, uvsrc_y<<field_based,
> +                                s->h_edge_pos>>1, s->v_edge_pos>>1);
> +            ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9,
> +                                9 + field_based,
> +                                uvsrc_x, uvsrc_y<<field_based,
> +                                s->h_edge_pos>>1, s->v_edge_pos>>1);

same here


[...]
> @@ -596,7 +603,9 @@ static inline void chroma_4mv_motion(MpegEncContext *s,
>  
>      ptr = ref_picture[2] + offset;
>      if(emu){
> -        ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
> +        ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9,
> +                            9, src_x, src_y,
> +                            s->h_edge_pos>>1, s->v_edge_pos>>1);

and here


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

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080407/f9b8edce/attachment.pgp>