mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-07 11:13:41 +02:00
80e9e63c94
* commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
171 lines
6.3 KiB
C
171 lines
6.3 KiB
C
/*
|
|
* MPEG4 decoder / encoder common code.
|
|
* Copyright (c) 2000,2001 Fabrice Bellard
|
|
* Copyright (c) 2002-2010 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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 FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "mpegvideo.h"
|
|
#include "mpeg4video.h"
|
|
#include "mpeg4data.h"
|
|
|
|
uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
|
|
|
|
int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s){
|
|
switch(s->pict_type){
|
|
case AV_PICTURE_TYPE_I:
|
|
return 16;
|
|
case AV_PICTURE_TYPE_P:
|
|
case AV_PICTURE_TYPE_S:
|
|
return s->f_code+15;
|
|
case AV_PICTURE_TYPE_B:
|
|
return FFMAX3(s->f_code, s->b_code, 2) + 15;
|
|
default:
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
void ff_mpeg4_clean_buffers(MpegEncContext *s)
|
|
{
|
|
int c_wrap, c_xy, l_wrap, l_xy;
|
|
|
|
l_wrap= s->b8_stride;
|
|
l_xy= (2*s->mb_y-1)*l_wrap + s->mb_x*2 - 1;
|
|
c_wrap= s->mb_stride;
|
|
c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1;
|
|
|
|
#if 0
|
|
/* clean DC */
|
|
memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1);
|
|
memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1);
|
|
memsetw(s->dc_val[2] + c_xy, 1024, c_wrap+1);
|
|
#endif
|
|
|
|
/* clean AC */
|
|
memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t));
|
|
memset(s->ac_val[1] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t));
|
|
memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t));
|
|
|
|
/* clean MV */
|
|
// we can't clear the MVs as they might be needed by a b frame
|
|
// memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t));
|
|
// memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2));
|
|
s->last_mv[0][0][0]=
|
|
s->last_mv[0][0][1]=
|
|
s->last_mv[1][0][0]=
|
|
s->last_mv[1][0][1]= 0;
|
|
}
|
|
|
|
#define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0]))
|
|
#define tab_bias (tab_size/2)
|
|
|
|
//used by mpeg4 and rv10 decoder
|
|
void ff_mpeg4_init_direct_mv(MpegEncContext *s){
|
|
int i;
|
|
for(i=0; i<tab_size; i++){
|
|
s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
|
|
s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time;
|
|
}
|
|
}
|
|
|
|
static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
|
|
int xy= s->block_index[i];
|
|
uint16_t time_pp= s->pp_time;
|
|
uint16_t time_pb= s->pb_time;
|
|
int p_mx, p_my;
|
|
|
|
p_mx = s->next_picture.motion_val[0][xy][0];
|
|
if((unsigned)(p_mx + tab_bias) < tab_size){
|
|
s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx;
|
|
s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
|
|
: s->direct_scale_mv[1][p_mx + tab_bias];
|
|
}else{
|
|
s->mv[0][i][0] = p_mx*time_pb/time_pp + mx;
|
|
s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
|
|
: p_mx*(time_pb - time_pp)/time_pp;
|
|
}
|
|
p_my = s->next_picture.motion_val[0][xy][1];
|
|
if((unsigned)(p_my + tab_bias) < tab_size){
|
|
s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my;
|
|
s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
|
|
: s->direct_scale_mv[1][p_my + tab_bias];
|
|
}else{
|
|
s->mv[0][i][1] = p_my*time_pb/time_pp + my;
|
|
s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
|
|
: p_my*(time_pb - time_pp)/time_pp;
|
|
}
|
|
}
|
|
|
|
#undef tab_size
|
|
#undef tab_bias
|
|
|
|
/**
|
|
*
|
|
* @return the mb_type
|
|
*/
|
|
int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my){
|
|
const int mb_index= s->mb_x + s->mb_y*s->mb_stride;
|
|
const int colocated_mb_type = s->next_picture.mb_type[mb_index];
|
|
uint16_t time_pp;
|
|
uint16_t time_pb;
|
|
int i;
|
|
|
|
//FIXME avoid divides
|
|
// try special case with shifts for 1 and 3 B-frames?
|
|
|
|
if(IS_8X8(colocated_mb_type)){
|
|
s->mv_type = MV_TYPE_8X8;
|
|
for(i=0; i<4; i++){
|
|
ff_mpeg4_set_one_direct_mv(s, mx, my, i);
|
|
}
|
|
return MB_TYPE_DIRECT2 | MB_TYPE_8x8 | MB_TYPE_L0L1;
|
|
} else if(IS_INTERLACED(colocated_mb_type)){
|
|
s->mv_type = MV_TYPE_FIELD;
|
|
for(i=0; i<2; i++){
|
|
int field_select = s->next_picture.ref_index[0][4 * mb_index + 2 * i];
|
|
s->field_select[0][i]= field_select;
|
|
s->field_select[1][i]= i;
|
|
if(s->top_field_first){
|
|
time_pp= s->pp_field_time - field_select + i;
|
|
time_pb= s->pb_field_time - field_select + i;
|
|
}else{
|
|
time_pp= s->pp_field_time + field_select - i;
|
|
time_pb= s->pb_field_time + field_select - i;
|
|
}
|
|
s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx;
|
|
s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my;
|
|
s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0]
|
|
: s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp;
|
|
s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1]
|
|
: s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp;
|
|
}
|
|
return MB_TYPE_DIRECT2 | MB_TYPE_16x8 | MB_TYPE_L0L1 | MB_TYPE_INTERLACED;
|
|
}else{
|
|
ff_mpeg4_set_one_direct_mv(s, mx, my, 0);
|
|
s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0];
|
|
s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1];
|
|
s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0];
|
|
s->mv[1][1][1] = s->mv[1][2][1] = s->mv[1][3][1] = s->mv[1][0][1];
|
|
if((s->avctx->workaround_bugs & FF_BUG_DIRECT_BLOCKSIZE) || !s->quarter_sample)
|
|
s->mv_type= MV_TYPE_16X16;
|
|
else
|
|
s->mv_type= MV_TYPE_8X8;
|
|
return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line
|
|
}
|
|
}
|