diff options
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index c76a14b6be..b071d74c92 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -5,20 +5,20 @@ * * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,6 +36,7 @@ #include "mpeg4video.h" #include "msmpeg4data.h" #include "vc1data.h" +#include "libavutil/imgutils.h" /* * You can also call this codec : MPEG4 with a twist ! @@ -51,6 +52,9 @@ static av_cold void init_h263_dc_for_msmpeg4(void) { int level, uni_code, uni_len; + if(ff_v2_dc_chroma_table[255 + 256][1]) + return; + for(level=-256; level<256; level++){ int size, v, l; /* find number of bits */ @@ -103,8 +107,6 @@ static av_cold void init_h263_dc_for_msmpeg4(void) av_cold void ff_msmpeg4_common_init(MpegEncContext *s) { - static int initialized=0; - switch(s->msmpeg4_version){ case 1: case 2: @@ -143,11 +145,7 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s) } //Note the default tables are set in common_init in mpegvideo.c - if(!initialized){ - initialized=1; - - init_h263_dc_for_msmpeg4(); - } + init_h263_dc_for_msmpeg4(); } /* predict coded block */ @@ -177,13 +175,13 @@ int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block return pred; } -static int get_dc(uint8_t *src, int stride, int scale) +static int get_dc(uint8_t *src, int stride, int scale, int block_size) { int y; int sum=0; - for(y=0; y<8; y++){ + for(y=0; y<block_size; y++){ int x; - for(x=0; x<8; x++){ + for(x=0; x<block_size; x++){ sum+=src[x + y*stride]; } } @@ -229,13 +227,13 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, "addl %%eax, %2 \n\t" "addl %%eax, %1 \n\t" "addl %0, %%eax \n\t" - "mull %4 \n\t" + "imull %4 \n\t" "movl %%edx, %0 \n\t" "movl %1, %%eax \n\t" - "mull %4 \n\t" + "imull %4 \n\t" "movl %%edx, %1 \n\t" "movl %2, %%eax \n\t" - "mull %4 \n\t" + "imull %4 \n\t" "movl %%edx, %2 \n\t" : "+b" (a), "+c" (b), "+D" (c) : "g" (scale), "S" (ff_inverse[scale]) @@ -275,17 +273,18 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, *dir_ptr = 0; } }else{ + int bs = 8 >> s->avctx->lowres; if(n<4){ wrap= s->linesize; - dest= s->current_picture.f.data[0] + (((n >> 1) + 2*s->mb_y) * 8* wrap ) + ((n & 1) + 2*s->mb_x) * 8; + dest= s->current_picture.f.data[0] + (((n >> 1) + 2*s->mb_y) * bs* wrap ) + ((n & 1) + 2*s->mb_x) * bs; }else{ wrap= s->uvlinesize; - dest= s->current_picture.f.data[n - 3] + (s->mb_y * 8 * wrap) + s->mb_x * 8; + dest= s->current_picture.f.data[n - 3] + (s->mb_y * bs * wrap) + s->mb_x * bs; } if(s->mb_x==0) a= (1024 + (scale>>1))/scale; - else a= get_dc(dest-8, wrap, scale*8); + else a= get_dc(dest-bs, wrap, scale*8>>(2*s->avctx->lowres), bs); if(s->mb_y==0) c= (1024 + (scale>>1))/scale; - else c= get_dc(dest-8*wrap, wrap, scale*8); + else c= get_dc(dest-bs*wrap, wrap, scale*8>>(2*s->avctx->lowres), bs); if (s->h263_aic_dir==0) { pred= a; |