Merge commit '759001c534'
* commit '759001c534': 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 '759001c534' 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>
This commit is contained in:
Michael Niedermayer
commit
80e9e63c94
275 changed files with 4180 additions and 4878 deletions
|
|
@ -147,7 +147,7 @@ static void guess_dc(ERContext *s, int16_t *dc, int w,
|
|||
for(b_x=0; b_x<w; b_x++){
|
||||
int mb_index_j= (b_x>>is_luma) + (b_y>>is_luma)*s->mb_stride;
|
||||
int error_j= s->error_status_table[mb_index_j];
|
||||
int intra_j = IS_INTRA(s->cur_pic->f.mb_type[mb_index_j]);
|
||||
int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
|
||||
if(intra_j==0 || !(error_j&ER_DC_ERROR)){
|
||||
color= dc[b_x + b_y*stride];
|
||||
distance= b_x;
|
||||
|
|
@ -160,7 +160,7 @@ static void guess_dc(ERContext *s, int16_t *dc, int w,
|
|||
for(b_x=w-1; b_x>=0; b_x--){
|
||||
int mb_index_j= (b_x>>is_luma) + (b_y>>is_luma)*s->mb_stride;
|
||||
int error_j= s->error_status_table[mb_index_j];
|
||||
int intra_j = IS_INTRA(s->cur_pic->f.mb_type[mb_index_j]);
|
||||
int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
|
||||
if(intra_j==0 || !(error_j&ER_DC_ERROR)){
|
||||
color= dc[b_x + b_y*stride];
|
||||
distance= b_x;
|
||||
|
|
@ -175,7 +175,7 @@ static void guess_dc(ERContext *s, int16_t *dc, int w,
|
|||
for(b_y=0; b_y<h; b_y++){
|
||||
int mb_index_j= (b_x>>is_luma) + (b_y>>is_luma)*s->mb_stride;
|
||||
int error_j= s->error_status_table[mb_index_j];
|
||||
int intra_j = IS_INTRA(s->cur_pic->f.mb_type[mb_index_j]);
|
||||
int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
|
||||
if(intra_j==0 || !(error_j&ER_DC_ERROR)){
|
||||
color= dc[b_x + b_y*stride];
|
||||
distance= b_y;
|
||||
|
|
@ -188,7 +188,7 @@ static void guess_dc(ERContext *s, int16_t *dc, int w,
|
|||
for(b_y=h-1; b_y>=0; b_y--){
|
||||
int mb_index_j= (b_x>>is_luma) + (b_y>>is_luma)*s->mb_stride;
|
||||
int error_j= s->error_status_table[mb_index_j];
|
||||
int intra_j = IS_INTRA(s->cur_pic->f.mb_type[mb_index_j]);
|
||||
int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
|
||||
if(intra_j==0 || !(error_j&ER_DC_ERROR)){
|
||||
color= dc[b_x + b_y*stride];
|
||||
distance= b_y;
|
||||
|
|
@ -205,7 +205,7 @@ static void guess_dc(ERContext *s, int16_t *dc, int w,
|
|||
mb_index = (b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride;
|
||||
error = s->error_status_table[mb_index];
|
||||
|
||||
if (IS_INTER(s->cur_pic->f.mb_type[mb_index]))
|
||||
if (IS_INTER(s->cur_pic->mb_type[mb_index]))
|
||||
continue; // inter
|
||||
if (!(error & ER_DC_ERROR))
|
||||
continue; // dc-ok
|
||||
|
|
@ -246,13 +246,13 @@ static void h_block_filter(ERContext *s, uint8_t *dst, int w,
|
|||
int y;
|
||||
int left_status = s->error_status_table[( b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride];
|
||||
int right_status = s->error_status_table[((b_x + 1) >> is_luma) + (b_y >> is_luma) * s->mb_stride];
|
||||
int left_intra = IS_INTRA(s->cur_pic->f.mb_type[( b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
|
||||
int right_intra = IS_INTRA(s->cur_pic->f.mb_type[((b_x + 1) >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
|
||||
int left_intra = IS_INTRA(s->cur_pic->mb_type[( b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
|
||||
int right_intra = IS_INTRA(s->cur_pic->mb_type[((b_x + 1) >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
|
||||
int left_damage = left_status & ER_MB_ERROR;
|
||||
int right_damage = right_status & ER_MB_ERROR;
|
||||
int offset = b_x * 8 + b_y * stride * 8;
|
||||
int16_t *left_mv = s->cur_pic->f.motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
|
||||
int16_t *right_mv = s->cur_pic->f.motion_val[0][mvy_stride * b_y + mvx_stride * (b_x + 1)];
|
||||
int16_t *left_mv = s->cur_pic->motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
|
||||
int16_t *right_mv = s->cur_pic->motion_val[0][mvy_stride * b_y + mvx_stride * (b_x + 1)];
|
||||
if (!(left_damage || right_damage))
|
||||
continue; // both undamaged
|
||||
if ((!left_intra) && (!right_intra) &&
|
||||
|
|
@ -314,14 +314,14 @@ static void v_block_filter(ERContext *s, uint8_t *dst, int w, int h,
|
|||
int x;
|
||||
int top_status = s->error_status_table[(b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride];
|
||||
int bottom_status = s->error_status_table[(b_x >> is_luma) + ((b_y + 1) >> is_luma) * s->mb_stride];
|
||||
int top_intra = IS_INTRA(s->cur_pic->f.mb_type[(b_x >> is_luma) + ( b_y >> is_luma) * s->mb_stride]);
|
||||
int bottom_intra = IS_INTRA(s->cur_pic->f.mb_type[(b_x >> is_luma) + ((b_y + 1) >> is_luma) * s->mb_stride]);
|
||||
int top_intra = IS_INTRA(s->cur_pic->mb_type[(b_x >> is_luma) + ( b_y >> is_luma) * s->mb_stride]);
|
||||
int bottom_intra = IS_INTRA(s->cur_pic->mb_type[(b_x >> is_luma) + ((b_y + 1) >> is_luma) * s->mb_stride]);
|
||||
int top_damage = top_status & ER_MB_ERROR;
|
||||
int bottom_damage = bottom_status & ER_MB_ERROR;
|
||||
int offset = b_x * 8 + b_y * stride * 8;
|
||||
|
||||
int16_t *top_mv = s->cur_pic->f.motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
|
||||
int16_t *bottom_mv = s->cur_pic->f.motion_val[0][mvy_stride * (b_y + 1) + mvx_stride * b_x];
|
||||
int16_t *top_mv = s->cur_pic->motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
|
||||
int16_t *bottom_mv = s->cur_pic->motion_val[0][mvy_stride * (b_y + 1) + mvx_stride * b_x];
|
||||
|
||||
if (!(top_damage || bottom_damage))
|
||||
continue; // both undamaged
|
||||
|
|
@ -386,7 +386,7 @@ static void guess_mv(ERContext *s)
|
|||
int f = 0;
|
||||
int error = s->error_status_table[mb_xy];
|
||||
|
||||
if (IS_INTRA(s->cur_pic->f.mb_type[mb_xy]))
|
||||
if (IS_INTRA(s->cur_pic->mb_type[mb_xy]))
|
||||
f = MV_FROZEN; // intra // FIXME check
|
||||
if (!(error & ER_MV_ERROR))
|
||||
f = MV_FROZEN; // inter with undamaged MV
|
||||
|
|
@ -394,13 +394,13 @@ static void guess_mv(ERContext *s)
|
|||
fixed[mb_xy] = f;
|
||||
if (f == MV_FROZEN)
|
||||
num_avail++;
|
||||
else if(s->last_pic->f.data[0] && s->last_pic->f.motion_val[0]){
|
||||
else if(s->last_pic->f.data[0] && s->last_pic->motion_val[0]){
|
||||
const int mb_y= mb_xy / s->mb_stride;
|
||||
const int mb_x= mb_xy % s->mb_stride;
|
||||
const int mot_index= (mb_x + mb_y*mot_stride) * mot_step;
|
||||
s->cur_pic->f.motion_val[0][mot_index][0]= s->last_pic->f.motion_val[0][mot_index][0];
|
||||
s->cur_pic->f.motion_val[0][mot_index][1]= s->last_pic->f.motion_val[0][mot_index][1];
|
||||
s->cur_pic->f.ref_index[0][4*mb_xy] = s->last_pic->f.ref_index[0][4*mb_xy];
|
||||
s->cur_pic->motion_val[0][mot_index][0]= s->last_pic->motion_val[0][mot_index][0];
|
||||
s->cur_pic->motion_val[0][mot_index][1]= s->last_pic->motion_val[0][mot_index][1];
|
||||
s->cur_pic->ref_index[0][4*mb_xy] = s->last_pic->ref_index[0][4*mb_xy];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -411,7 +411,7 @@ static void guess_mv(ERContext *s)
|
|||
const int mb_xy = mb_x + mb_y * s->mb_stride;
|
||||
int mv_dir = (s->last_pic && s->last_pic->f.data[0]) ? MV_DIR_FORWARD : MV_DIR_BACKWARD;
|
||||
|
||||
if (IS_INTRA(s->cur_pic->f.mb_type[mb_xy]))
|
||||
if (IS_INTRA(s->cur_pic->mb_type[mb_xy]))
|
||||
continue;
|
||||
if (!(s->error_status_table[mb_xy] & ER_MV_ERROR))
|
||||
continue;
|
||||
|
|
@ -452,7 +452,7 @@ static void guess_mv(ERContext *s)
|
|||
|
||||
if (fixed[mb_xy] == MV_FROZEN)
|
||||
continue;
|
||||
av_assert1(!IS_INTRA(s->cur_pic->f.mb_type[mb_xy]));
|
||||
av_assert1(!IS_INTRA(s->cur_pic->mb_type[mb_xy]));
|
||||
av_assert1(s->last_pic && s->last_pic->f.data[0]);
|
||||
|
||||
j = 0;
|
||||
|
|
@ -483,38 +483,38 @@ static void guess_mv(ERContext *s)
|
|||
|
||||
if (mb_x > 0 && fixed[mb_xy - 1]) {
|
||||
mv_predictor[pred_count][0] =
|
||||
s->cur_pic->f.motion_val[0][mot_index - mot_step][0];
|
||||
s->cur_pic->motion_val[0][mot_index - mot_step][0];
|
||||
mv_predictor[pred_count][1] =
|
||||
s->cur_pic->f.motion_val[0][mot_index - mot_step][1];
|
||||
s->cur_pic->motion_val[0][mot_index - mot_step][1];
|
||||
ref[pred_count] =
|
||||
s->cur_pic->f.ref_index[0][4 * (mb_xy - 1)];
|
||||
s->cur_pic->ref_index[0][4 * (mb_xy - 1)];
|
||||
pred_count++;
|
||||
}
|
||||
if (mb_x + 1 < mb_width && fixed[mb_xy + 1]) {
|
||||
mv_predictor[pred_count][0] =
|
||||
s->cur_pic->f.motion_val[0][mot_index + mot_step][0];
|
||||
s->cur_pic->motion_val[0][mot_index + mot_step][0];
|
||||
mv_predictor[pred_count][1] =
|
||||
s->cur_pic->f.motion_val[0][mot_index + mot_step][1];
|
||||
s->cur_pic->motion_val[0][mot_index + mot_step][1];
|
||||
ref[pred_count] =
|
||||
s->cur_pic->f.ref_index[0][4 * (mb_xy + 1)];
|
||||
s->cur_pic->ref_index[0][4 * (mb_xy + 1)];
|
||||
pred_count++;
|
||||
}
|
||||
if (mb_y > 0 && fixed[mb_xy - mb_stride]) {
|
||||
mv_predictor[pred_count][0] =
|
||||
s->cur_pic->f.motion_val[0][mot_index - mot_stride * mot_step][0];
|
||||
s->cur_pic->motion_val[0][mot_index - mot_stride * mot_step][0];
|
||||
mv_predictor[pred_count][1] =
|
||||
s->cur_pic->f.motion_val[0][mot_index - mot_stride * mot_step][1];
|
||||
s->cur_pic->motion_val[0][mot_index - mot_stride * mot_step][1];
|
||||
ref[pred_count] =
|
||||
s->cur_pic->f.ref_index[0][4 * (mb_xy - s->mb_stride)];
|
||||
s->cur_pic->ref_index[0][4 * (mb_xy - s->mb_stride)];
|
||||
pred_count++;
|
||||
}
|
||||
if (mb_y + 1<mb_height && fixed[mb_xy + mb_stride]) {
|
||||
mv_predictor[pred_count][0] =
|
||||
s->cur_pic->f.motion_val[0][mot_index + mot_stride * mot_step][0];
|
||||
s->cur_pic->motion_val[0][mot_index + mot_stride * mot_step][0];
|
||||
mv_predictor[pred_count][1] =
|
||||
s->cur_pic->f.motion_val[0][mot_index + mot_stride * mot_step][1];
|
||||
s->cur_pic->motion_val[0][mot_index + mot_stride * mot_step][1];
|
||||
ref[pred_count] =
|
||||
s->cur_pic->f.ref_index[0][4 * (mb_xy + s->mb_stride)];
|
||||
s->cur_pic->ref_index[0][4 * (mb_xy + s->mb_stride)];
|
||||
pred_count++;
|
||||
}
|
||||
if (pred_count == 0)
|
||||
|
|
@ -572,19 +572,19 @@ skip_mean_and_median:
|
|||
if (s->avctx->codec_id == AV_CODEC_ID_H264) {
|
||||
// FIXME
|
||||
} else {
|
||||
ff_thread_await_progress(&s->last_pic->f,
|
||||
ff_thread_await_progress(&s->last_pic->tf,
|
||||
mb_y, 0);
|
||||
}
|
||||
if (!s->last_pic->f.motion_val[0] ||
|
||||
!s->last_pic->f.ref_index[0])
|
||||
if (!s->last_pic->motion_val[0] ||
|
||||
!s->last_pic->ref_index[0])
|
||||
goto skip_last_mv;
|
||||
prev_x = s->last_pic->f.motion_val[0][mot_index][0];
|
||||
prev_y = s->last_pic->f.motion_val[0][mot_index][1];
|
||||
prev_ref = s->last_pic->f.ref_index[0][4 * mb_xy];
|
||||
prev_x = s->last_pic->motion_val[0][mot_index][0];
|
||||
prev_y = s->last_pic->motion_val[0][mot_index][1];
|
||||
prev_ref = s->last_pic->ref_index[0][4 * mb_xy];
|
||||
} else {
|
||||
prev_x = s->cur_pic->f.motion_val[0][mot_index][0];
|
||||
prev_y = s->cur_pic->f.motion_val[0][mot_index][1];
|
||||
prev_ref = s->cur_pic->f.ref_index[0][4 * mb_xy];
|
||||
prev_x = s->cur_pic->motion_val[0][mot_index][0];
|
||||
prev_y = s->cur_pic->motion_val[0][mot_index][1];
|
||||
prev_ref = s->cur_pic->ref_index[0][4 * mb_xy];
|
||||
}
|
||||
|
||||
/* last MV */
|
||||
|
|
@ -601,9 +601,9 @@ skip_last_mv:
|
|||
uint8_t *src = s->cur_pic->f.data[0] +
|
||||
mb_x * 16 + mb_y * 16 * linesize[0];
|
||||
|
||||
s->cur_pic->f.motion_val[0][mot_index][0] =
|
||||
s->cur_pic->motion_val[0][mot_index][0] =
|
||||
s->mv[0][0][0] = mv_predictor[j][0];
|
||||
s->cur_pic->f.motion_val[0][mot_index][1] =
|
||||
s->cur_pic->motion_val[0][mot_index][1] =
|
||||
s->mv[0][0][1] = mv_predictor[j][1];
|
||||
|
||||
// predictor intra or otherwise not available
|
||||
|
|
@ -648,8 +648,8 @@ skip_last_mv:
|
|||
|
||||
for (i = 0; i < mot_step; i++)
|
||||
for (j = 0; j < mot_step; j++) {
|
||||
s->cur_pic->f.motion_val[0][mot_index + i + j * mot_stride][0] = s->mv[0][0][0];
|
||||
s->cur_pic->f.motion_val[0][mot_index + i + j * mot_stride][1] = s->mv[0][0][1];
|
||||
s->cur_pic->motion_val[0][mot_index + i + j * mot_stride][0] = s->mv[0][0][0];
|
||||
s->cur_pic->motion_val[0][mot_index + i + j * mot_stride][1] = s->mv[0][0][1];
|
||||
}
|
||||
|
||||
s->decode_mb(s->opaque, ref[best_pred], MV_DIR_FORWARD,
|
||||
|
|
@ -731,7 +731,7 @@ static int is_intra_more_likely(ERContext *s)
|
|||
if (s->avctx->codec_id == AV_CODEC_ID_H264) {
|
||||
// FIXME
|
||||
} else {
|
||||
ff_thread_await_progress(&s->last_pic->f, mb_y, 0);
|
||||
ff_thread_await_progress(&s->last_pic->tf, mb_y, 0);
|
||||
}
|
||||
is_intra_likely += s->dsp->sad[0](NULL, last_mb_ptr, mb_ptr,
|
||||
linesize[0], 16);
|
||||
|
|
@ -740,7 +740,7 @@ static int is_intra_more_likely(ERContext *s)
|
|||
last_mb_ptr + linesize[0] * 16,
|
||||
linesize[0], 16);
|
||||
} else {
|
||||
if (IS_INTRA(s->cur_pic->f.mb_type[mb_xy]))
|
||||
if (IS_INTRA(s->cur_pic->mb_type[mb_xy]))
|
||||
is_intra_likely++;
|
||||
else
|
||||
is_intra_likely--;
|
||||
|
|
@ -875,13 +875,25 @@ void ff_er_frame_end(ERContext *s)
|
|||
}
|
||||
}
|
||||
|
||||
if (s->cur_pic->f.motion_val[0] == NULL) {
|
||||
if (s->cur_pic->motion_val[0] == NULL) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n");
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
s->cur_pic->f.ref_index[i] = av_mallocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t));
|
||||
s->cur_pic->motion_val_base[i] = av_mallocz((size + 4) * 2 * sizeof(uint16_t));
|
||||
s->cur_pic->f.motion_val[i] = s->cur_pic->motion_val_base[i] + 4;
|
||||
s->cur_pic->ref_index_buf[i] = av_buffer_allocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t));
|
||||
s->cur_pic->motion_val_buf[i] = av_buffer_allocz((size + 4) * 2 * sizeof(uint16_t));
|
||||
if (!s->cur_pic->ref_index_buf[i] || !s->cur_pic->motion_val_buf[i])
|
||||
break;
|
||||
s->cur_pic->ref_index[i] = s->cur_pic->ref_index_buf[i]->data;
|
||||
s->cur_pic->motion_val[i] = (int16_t (*)[2])s->cur_pic->motion_val_buf[i]->data + 4;
|
||||
}
|
||||
if (i < 2) {
|
||||
for (i = 0; i < 2; i++) {
|
||||
av_buffer_unref(&s->cur_pic->ref_index_buf[i]);
|
||||
av_buffer_unref(&s->cur_pic->motion_val_buf[i]);
|
||||
s->cur_pic->ref_index[i] = NULL;
|
||||
s->cur_pic->motion_val[i] = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
s->cur_pic->f.motion_subsample_log2 = 3;
|
||||
}
|
||||
|
|
@ -1046,9 +1058,9 @@ void ff_er_frame_end(ERContext *s)
|
|||
continue;
|
||||
|
||||
if (is_intra_likely)
|
||||
s->cur_pic->f.mb_type[mb_xy] = MB_TYPE_INTRA4x4;
|
||||
s->cur_pic->mb_type[mb_xy] = MB_TYPE_INTRA4x4;
|
||||
else
|
||||
s->cur_pic->f.mb_type[mb_xy] = MB_TYPE_16x16 | MB_TYPE_L0;
|
||||
s->cur_pic->mb_type[mb_xy] = MB_TYPE_16x16 | MB_TYPE_L0;
|
||||
}
|
||||
|
||||
// change inter to intra blocks if no reference frames are available
|
||||
|
|
@ -1056,15 +1068,15 @@ void ff_er_frame_end(ERContext *s)
|
|||
!(s->next_pic && s->next_pic->f.data[0]))
|
||||
for (i = 0; i < s->mb_num; i++) {
|
||||
const int mb_xy = s->mb_index2xy[i];
|
||||
if (!IS_INTRA(s->cur_pic->f.mb_type[mb_xy]))
|
||||
s->cur_pic->f.mb_type[mb_xy] = MB_TYPE_INTRA4x4;
|
||||
if (!IS_INTRA(s->cur_pic->mb_type[mb_xy]))
|
||||
s->cur_pic->mb_type[mb_xy] = MB_TYPE_INTRA4x4;
|
||||
}
|
||||
|
||||
/* handle inter blocks with damaged AC */
|
||||
for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
|
||||
for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
|
||||
const int mb_xy = mb_x + mb_y * s->mb_stride;
|
||||
const int mb_type = s->cur_pic->f.mb_type[mb_xy];
|
||||
const int mb_type = s->cur_pic->mb_type[mb_xy];
|
||||
const int dir = !(s->last_pic && s->last_pic->f.data[0]);
|
||||
const int mv_dir = dir ? MV_DIR_BACKWARD : MV_DIR_FORWARD;
|
||||
int mv_type;
|
||||
|
|
@ -1083,13 +1095,13 @@ void ff_er_frame_end(ERContext *s)
|
|||
int j;
|
||||
mv_type = MV_TYPE_8X8;
|
||||
for (j = 0; j < 4; j++) {
|
||||
s->mv[0][j][0] = s->cur_pic->f.motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][0];
|
||||
s->mv[0][j][1] = s->cur_pic->f.motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][1];
|
||||
s->mv[0][j][0] = s->cur_pic->motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][0];
|
||||
s->mv[0][j][1] = s->cur_pic->motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][1];
|
||||
}
|
||||
} else {
|
||||
mv_type = MV_TYPE_16X16;
|
||||
s->mv[0][0][0] = s->cur_pic->f.motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][0];
|
||||
s->mv[0][0][1] = s->cur_pic->f.motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][1];
|
||||
s->mv[0][0][0] = s->cur_pic->motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][0];
|
||||
s->mv[0][0][1] = s->cur_pic->motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][1];
|
||||
}
|
||||
|
||||
s->decode_mb(s->opaque, 0 /* FIXME h264 partitioned slices need this set */,
|
||||
|
|
@ -1103,7 +1115,7 @@ void ff_er_frame_end(ERContext *s)
|
|||
for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
|
||||
int xy = mb_x * 2 + mb_y * 2 * s->b8_stride;
|
||||
const int mb_xy = mb_x + mb_y * s->mb_stride;
|
||||
const int mb_type = s->cur_pic->f.mb_type[mb_xy];
|
||||
const int mb_type = s->cur_pic->mb_type[mb_xy];
|
||||
int mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
|
||||
|
||||
error = s->error_status_table[mb_xy];
|
||||
|
|
@ -1125,12 +1137,12 @@ void ff_er_frame_end(ERContext *s)
|
|||
int time_pb = s->pb_time;
|
||||
|
||||
av_assert0(s->avctx->codec_id != AV_CODEC_ID_H264);
|
||||
ff_thread_await_progress(&s->next_pic->f, mb_y, 0);
|
||||
ff_thread_await_progress(&s->next_pic->tf, mb_y, 0);
|
||||
|
||||
s->mv[0][0][0] = s->next_pic->f.motion_val[0][xy][0] * time_pb / time_pp;
|
||||
s->mv[0][0][1] = s->next_pic->f.motion_val[0][xy][1] * time_pb / time_pp;
|
||||
s->mv[1][0][0] = s->next_pic->f.motion_val[0][xy][0] * (time_pb - time_pp) / time_pp;
|
||||
s->mv[1][0][1] = s->next_pic->f.motion_val[0][xy][1] * (time_pb - time_pp) / time_pp;
|
||||
s->mv[0][0][0] = s->next_pic->motion_val[0][xy][0] * time_pb / time_pp;
|
||||
s->mv[0][0][1] = s->next_pic->motion_val[0][xy][1] * time_pb / time_pp;
|
||||
s->mv[1][0][0] = s->next_pic->motion_val[0][xy][0] * (time_pb - time_pp) / time_pp;
|
||||
s->mv[1][0][1] = s->next_pic->motion_val[0][xy][1] * (time_pb - time_pp) / time_pp;
|
||||
} else {
|
||||
s->mv[0][0][0] = 0;
|
||||
s->mv[0][0][1] = 0;
|
||||
|
|
@ -1155,7 +1167,7 @@ void ff_er_frame_end(ERContext *s)
|
|||
int16_t *dc_ptr;
|
||||
uint8_t *dest_y, *dest_cb, *dest_cr;
|
||||
const int mb_xy = mb_x + mb_y * s->mb_stride;
|
||||
const int mb_type = s->cur_pic->f.mb_type[mb_xy];
|
||||
const int mb_type = s->cur_pic->mb_type[mb_xy];
|
||||
|
||||
error = s->error_status_table[mb_xy];
|
||||
|
||||
|
|
@ -1208,7 +1220,7 @@ void ff_er_frame_end(ERContext *s)
|
|||
for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
|
||||
uint8_t *dest_y, *dest_cb, *dest_cr;
|
||||
const int mb_xy = mb_x + mb_y * s->mb_stride;
|
||||
const int mb_type = s->cur_pic->f.mb_type[mb_xy];
|
||||
const int mb_type = s->cur_pic->mb_type[mb_xy];
|
||||
|
||||
error = s->error_status_table[mb_xy];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue