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>
160 lines
7.2 KiB
C
160 lines
7.2 KiB
C
/*
|
|
* H.26L/H.264/AVC/JVT/14496-10/... decoder
|
|
* Copyright (c) 2003 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
|
|
*/
|
|
|
|
#undef MCFUNC
|
|
|
|
#if CHROMA_IDC == 1
|
|
# define MCFUNC(n) FUNC(n ## _420)
|
|
#elif CHROMA_IDC == 2
|
|
# define MCFUNC(n) FUNC(n ## _422)
|
|
#elif CHROMA_IDC == 3
|
|
# define MCFUNC(n) FUNC(n ## _444)
|
|
#endif
|
|
|
|
#undef mc_part
|
|
#define mc_part MCFUNC(mc_part)
|
|
|
|
static void mc_part(H264Context *h, int n, int square,
|
|
int height, int delta,
|
|
uint8_t *dest_y, uint8_t *dest_cb,
|
|
uint8_t *dest_cr,
|
|
int x_offset, int y_offset,
|
|
qpel_mc_func *qpix_put,
|
|
h264_chroma_mc_func chroma_put,
|
|
qpel_mc_func *qpix_avg,
|
|
h264_chroma_mc_func chroma_avg,
|
|
h264_weight_func *weight_op,
|
|
h264_biweight_func *weight_avg,
|
|
int list0, int list1)
|
|
{
|
|
if ((h->use_weight == 2 && list0 && list1 &&
|
|
(h->implicit_weight[h->ref_cache[0][scan8[n]]][h->ref_cache[1][scan8[n]]][h->mb_y & 1] != 32)) ||
|
|
h->use_weight == 1)
|
|
mc_part_weighted(h, n, square, height, delta, dest_y, dest_cb, dest_cr,
|
|
x_offset, y_offset, qpix_put, chroma_put,
|
|
weight_op[0], weight_op[1], weight_avg[0],
|
|
weight_avg[1], list0, list1, PIXEL_SHIFT, CHROMA_IDC);
|
|
else
|
|
mc_part_std(h, n, square, height, delta, dest_y, dest_cb, dest_cr,
|
|
x_offset, y_offset, qpix_put, chroma_put, qpix_avg,
|
|
chroma_avg, list0, list1, PIXEL_SHIFT, CHROMA_IDC);
|
|
}
|
|
|
|
static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y,
|
|
uint8_t *dest_cb, uint8_t *dest_cr,
|
|
qpel_mc_func(*qpix_put)[16],
|
|
h264_chroma_mc_func(*chroma_put),
|
|
qpel_mc_func(*qpix_avg)[16],
|
|
h264_chroma_mc_func(*chroma_avg),
|
|
h264_weight_func *weight_op,
|
|
h264_biweight_func *weight_avg)
|
|
{
|
|
const int mb_xy = h->mb_xy;
|
|
const int mb_type = h->cur_pic.mb_type[mb_xy];
|
|
|
|
av_assert2(IS_INTER(mb_type));
|
|
|
|
if (HAVE_THREADS && (h->avctx->active_thread_type & FF_THREAD_FRAME))
|
|
await_references(h);
|
|
prefetch_motion(h, 0, PIXEL_SHIFT, CHROMA_IDC);
|
|
|
|
if (IS_16X16(mb_type)) {
|
|
mc_part(h, 0, 1, 16, 0, dest_y, dest_cb, dest_cr, 0, 0,
|
|
qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
|
|
weight_op, weight_avg,
|
|
IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
|
|
} else if (IS_16X8(mb_type)) {
|
|
mc_part(h, 0, 0, 8, 8 << PIXEL_SHIFT, dest_y, dest_cb, dest_cr, 0, 0,
|
|
qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
|
|
weight_op, weight_avg,
|
|
IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
|
|
mc_part(h, 8, 0, 8, 8 << PIXEL_SHIFT, dest_y, dest_cb, dest_cr, 0, 4,
|
|
qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
|
|
weight_op, weight_avg,
|
|
IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
|
|
} else if (IS_8X16(mb_type)) {
|
|
mc_part(h, 0, 0, 16, 8 * h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0,
|
|
qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
|
|
&weight_op[1], &weight_avg[1],
|
|
IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
|
|
mc_part(h, 4, 0, 16, 8 * h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0,
|
|
qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
|
|
&weight_op[1], &weight_avg[1],
|
|
IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
|
|
} else {
|
|
int i;
|
|
|
|
av_assert2(IS_8X8(mb_type));
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
const int sub_mb_type = h->sub_mb_type[i];
|
|
const int n = 4 * i;
|
|
int x_offset = (i & 1) << 2;
|
|
int y_offset = (i & 2) << 1;
|
|
|
|
if (IS_SUB_8X8(sub_mb_type)) {
|
|
mc_part(h, n, 1, 8, 0, dest_y, dest_cb, dest_cr,
|
|
x_offset, y_offset,
|
|
qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
|
|
&weight_op[1], &weight_avg[1],
|
|
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
|
|
} else if (IS_SUB_8X4(sub_mb_type)) {
|
|
mc_part(h, n, 0, 4, 4 << PIXEL_SHIFT, dest_y, dest_cb, dest_cr,
|
|
x_offset, y_offset,
|
|
qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
|
|
&weight_op[1], &weight_avg[1],
|
|
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
|
|
mc_part(h, n + 2, 0, 4, 4 << PIXEL_SHIFT,
|
|
dest_y, dest_cb, dest_cr, x_offset, y_offset + 2,
|
|
qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
|
|
&weight_op[1], &weight_avg[1],
|
|
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
|
|
} else if (IS_SUB_4X8(sub_mb_type)) {
|
|
mc_part(h, n, 0, 8, 4 * h->mb_linesize,
|
|
dest_y, dest_cb, dest_cr, x_offset, y_offset,
|
|
qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
|
|
&weight_op[2], &weight_avg[2],
|
|
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
|
|
mc_part(h, n + 1, 0, 8, 4 * h->mb_linesize,
|
|
dest_y, dest_cb, dest_cr, x_offset + 2, y_offset,
|
|
qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
|
|
&weight_op[2], &weight_avg[2],
|
|
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
|
|
} else {
|
|
int j;
|
|
av_assert2(IS_SUB_4X4(sub_mb_type));
|
|
for (j = 0; j < 4; j++) {
|
|
int sub_x_offset = x_offset + 2 * (j & 1);
|
|
int sub_y_offset = y_offset + (j & 2);
|
|
mc_part(h, n + j, 1, 4, 0,
|
|
dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset,
|
|
qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
|
|
&weight_op[2], &weight_avg[2],
|
|
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
prefetch_motion(h, 1, PIXEL_SHIFT, CHROMA_IDC);
|
|
}
|
|
|