mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
57ed8debb9
This fixes encoding where the idct setting originally was set to FF_IDCT_AUTO and dsputil chose a default idct with a non-null permutation - even if the permutation tables were updated, dct_quantize in x86/mpegvideoenc_template.c also checked the value of this type variable. Signed-off-by: Martin Storsjö <martin@martin.st>
177 lines
6.4 KiB
C
177 lines
6.4 KiB
C
/*
|
|
* Copyright (c) 2002 The Libav Project
|
|
*
|
|
* This file is part of Libav.
|
|
*
|
|
* Libav 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,
|
|
* 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
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "mpegvideo.h"
|
|
#include "msmpeg4data.h"
|
|
#include "simple_idct.h"
|
|
#include "wmv2.h"
|
|
|
|
|
|
av_cold void ff_wmv2_common_init(Wmv2Context * w){
|
|
MpegEncContext * const s= &w->s;
|
|
|
|
ff_wmv2dsp_init(&w->wdsp);
|
|
s->dsp.idct_permutation_type = w->wdsp.idct_perm;
|
|
ff_init_scantable_permutation(s->dsp.idct_permutation,
|
|
w->wdsp.idct_perm);
|
|
ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0],
|
|
ff_wmv2_scantableA);
|
|
ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1],
|
|
ff_wmv2_scantableB);
|
|
ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable,
|
|
ff_wmv1_scantable[1]);
|
|
ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable,
|
|
ff_wmv1_scantable[2]);
|
|
ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable,
|
|
ff_wmv1_scantable[3]);
|
|
ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable,
|
|
ff_wmv1_scantable[0]);
|
|
s->dsp.idct_put = w->wdsp.idct_put;
|
|
s->dsp.idct_add = w->wdsp.idct_add;
|
|
s->dsp.idct = NULL;
|
|
}
|
|
|
|
static void wmv2_add_block(Wmv2Context *w, int16_t *block1, uint8_t *dst, int stride, int n){
|
|
MpegEncContext * const s= &w->s;
|
|
|
|
if (s->block_last_index[n] >= 0) {
|
|
switch(w->abt_type_table[n]){
|
|
case 0:
|
|
w->wdsp.idct_add(dst, stride, block1);
|
|
break;
|
|
case 1:
|
|
ff_simple_idct84_add(dst , stride, block1);
|
|
ff_simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]);
|
|
s->dsp.clear_block(w->abt_block2[n]);
|
|
break;
|
|
case 2:
|
|
ff_simple_idct48_add(dst , stride, block1);
|
|
ff_simple_idct48_add(dst + 4 , stride, w->abt_block2[n]);
|
|
s->dsp.clear_block(w->abt_block2[n]);
|
|
break;
|
|
default:
|
|
av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
void ff_wmv2_add_mb(MpegEncContext *s, int16_t block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){
|
|
Wmv2Context * const w= (Wmv2Context*)s;
|
|
|
|
wmv2_add_block(w, block1[0], dest_y , s->linesize, 0);
|
|
wmv2_add_block(w, block1[1], dest_y + 8 , s->linesize, 1);
|
|
wmv2_add_block(w, block1[2], dest_y + 8*s->linesize, s->linesize, 2);
|
|
wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3);
|
|
|
|
if(s->flags&CODEC_FLAG_GRAY) return;
|
|
|
|
wmv2_add_block(w, block1[4], dest_cb , s->uvlinesize, 4);
|
|
wmv2_add_block(w, block1[5], dest_cr , s->uvlinesize, 5);
|
|
}
|
|
|
|
void ff_mspel_motion(MpegEncContext *s,
|
|
uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
|
|
uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
|
|
int motion_x, int motion_y, int h)
|
|
{
|
|
Wmv2Context * const w= (Wmv2Context*)s;
|
|
uint8_t *ptr;
|
|
int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
|
|
int emu=0;
|
|
|
|
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
|
|
dxy = 2*dxy + w->hshift;
|
|
src_x = s->mb_x * 16 + (motion_x >> 1);
|
|
src_y = s->mb_y * 16 + (motion_y >> 1);
|
|
|
|
/* WARNING: do no forget half pels */
|
|
v_edge_pos = s->v_edge_pos;
|
|
src_x = av_clip(src_x, -16, s->width);
|
|
src_y = av_clip(src_y, -16, s->height);
|
|
|
|
if(src_x<=-16 || src_x >= s->width)
|
|
dxy &= ~3;
|
|
if(src_y<=-16 || src_y >= s->height)
|
|
dxy &= ~4;
|
|
|
|
linesize = s->linesize;
|
|
uvlinesize = s->uvlinesize;
|
|
ptr = ref_picture[0] + (src_y * linesize) + src_x;
|
|
|
|
if(s->flags&CODEC_FLAG_EMU_EDGE){
|
|
if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos
|
|
|| src_y + h+1 >= v_edge_pos){
|
|
s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19,
|
|
src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos);
|
|
ptr= s->edge_emu_buffer + 1 + s->linesize;
|
|
emu=1;
|
|
}
|
|
}
|
|
|
|
s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize);
|
|
s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize);
|
|
s->dsp.put_mspel_pixels_tab[dxy](dest_y +8*linesize, ptr +8*linesize, linesize);
|
|
s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize);
|
|
|
|
if(s->flags&CODEC_FLAG_GRAY) return;
|
|
|
|
if (s->out_format == FMT_H263) {
|
|
dxy = 0;
|
|
if ((motion_x & 3) != 0)
|
|
dxy |= 1;
|
|
if ((motion_y & 3) != 0)
|
|
dxy |= 2;
|
|
mx = motion_x >> 2;
|
|
my = motion_y >> 2;
|
|
} else {
|
|
mx = motion_x / 2;
|
|
my = motion_y / 2;
|
|
dxy = ((my & 1) << 1) | (mx & 1);
|
|
mx >>= 1;
|
|
my >>= 1;
|
|
}
|
|
|
|
src_x = s->mb_x * 8 + mx;
|
|
src_y = s->mb_y * 8 + my;
|
|
src_x = av_clip(src_x, -8, s->width >> 1);
|
|
if (src_x == (s->width >> 1))
|
|
dxy &= ~1;
|
|
src_y = av_clip(src_y, -8, s->height >> 1);
|
|
if (src_y == (s->height >> 1))
|
|
dxy &= ~2;
|
|
offset = (src_y * uvlinesize) + src_x;
|
|
ptr = ref_picture[1] + offset;
|
|
if(emu){
|
|
s->vdsp.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);
|
|
ptr= s->edge_emu_buffer;
|
|
}
|
|
pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1);
|
|
|
|
ptr = ref_picture[2] + offset;
|
|
if(emu){
|
|
s->vdsp.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);
|
|
ptr= s->edge_emu_buffer;
|
|
}
|
|
pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1);
|
|
}
|