* 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>
211 lines
8.1 KiB
C
211 lines
8.1 KiB
C
/*
|
|
* MPEG-4 Part 10 / AVC / H.264 HW decode acceleration through VDPAU
|
|
*
|
|
* Copyright (c) 2008 NVIDIA
|
|
* Copyright (c) 2013 Rémi Denis-Courmont
|
|
*
|
|
* 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 <vdpau/vdpau.h>
|
|
|
|
#include "avcodec.h"
|
|
#include "h264.h"
|
|
#include "vdpau.h"
|
|
#include "vdpau_internal.h"
|
|
|
|
static int32_t h264_foc(int foc)
|
|
{
|
|
if (foc == INT_MAX)
|
|
foc = 0;
|
|
return foc;
|
|
}
|
|
|
|
static void vdpau_h264_clear_rf(VdpReferenceFrameH264 *rf)
|
|
{
|
|
rf->surface = VDP_INVALID_HANDLE;
|
|
rf->is_long_term = VDP_FALSE;
|
|
rf->top_is_reference = VDP_FALSE;
|
|
rf->bottom_is_reference = VDP_FALSE;
|
|
rf->field_order_cnt[0] = 0;
|
|
rf->field_order_cnt[1] = 0;
|
|
rf->frame_idx = 0;
|
|
}
|
|
|
|
static void vdpau_h264_set_rf(VdpReferenceFrameH264 *rf, Picture *pic,
|
|
int pic_structure)
|
|
{
|
|
VdpVideoSurface surface = ff_vdpau_get_surface_id(pic);
|
|
|
|
if (pic_structure == 0)
|
|
pic_structure = pic->reference;
|
|
|
|
rf->surface = surface;
|
|
rf->is_long_term = pic->reference && pic->long_ref;
|
|
rf->top_is_reference = (pic_structure & PICT_TOP_FIELD) != 0;
|
|
rf->bottom_is_reference = (pic_structure & PICT_BOTTOM_FIELD) != 0;
|
|
rf->field_order_cnt[0] = h264_foc(pic->field_poc[0]);
|
|
rf->field_order_cnt[1] = h264_foc(pic->field_poc[1]);
|
|
rf->frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
|
|
}
|
|
|
|
static void vdpau_h264_set_reference_frames(AVCodecContext *avctx)
|
|
{
|
|
H264Context * const h = avctx->priv_data;
|
|
AVVDPAUContext *hwctx = avctx->hwaccel_context;
|
|
VdpPictureInfoH264 *info = &hwctx->info.h264;
|
|
int list;
|
|
|
|
VdpReferenceFrameH264 *rf = &info->referenceFrames[0];
|
|
#define H264_RF_COUNT FF_ARRAY_ELEMS(info->referenceFrames)
|
|
|
|
for (list = 0; list < 2; ++list) {
|
|
Picture **lp = list ? h->long_ref : h->short_ref;
|
|
int i, ls = list ? 16 : h->short_ref_count;
|
|
|
|
for (i = 0; i < ls; ++i) {
|
|
Picture *pic = lp[i];
|
|
VdpReferenceFrameH264 *rf2;
|
|
VdpVideoSurface surface_ref;
|
|
int pic_frame_idx;
|
|
|
|
if (!pic || !pic->reference)
|
|
continue;
|
|
pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
|
|
surface_ref = ff_vdpau_get_surface_id(pic);
|
|
|
|
rf2 = &info->referenceFrames[0];
|
|
while (rf2 != rf) {
|
|
if ((rf2->surface == surface_ref) &&
|
|
(rf2->is_long_term == pic->long_ref) &&
|
|
(rf2->frame_idx == pic_frame_idx))
|
|
break;
|
|
++rf2;
|
|
}
|
|
if (rf2 != rf) {
|
|
rf2->top_is_reference |= (pic->reference & PICT_TOP_FIELD) ? VDP_TRUE : VDP_FALSE;
|
|
rf2->bottom_is_reference |= (pic->reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
|
|
continue;
|
|
}
|
|
|
|
if (rf >= &info->referenceFrames[H264_RF_COUNT])
|
|
continue;
|
|
|
|
vdpau_h264_set_rf(rf, pic, pic->reference);
|
|
++rf;
|
|
}
|
|
}
|
|
|
|
for (; rf < &info->referenceFrames[H264_RF_COUNT]; ++rf)
|
|
vdpau_h264_clear_rf(rf);
|
|
}
|
|
|
|
static int vdpau_h264_start_frame(AVCodecContext *avctx,
|
|
const uint8_t *buffer, uint32_t size)
|
|
{
|
|
H264Context * const h = avctx->priv_data;
|
|
AVVDPAUContext *hwctx = avctx->hwaccel_context;
|
|
VdpPictureInfoH264 *info = &hwctx->info.h264;
|
|
Picture *pic = h->cur_pic_ptr;
|
|
|
|
/* init VdpPictureInfoH264 */
|
|
info->slice_count = 0;
|
|
info->field_order_cnt[0] = h264_foc(pic->field_poc[0]);
|
|
info->field_order_cnt[1] = h264_foc(pic->field_poc[1]);
|
|
info->is_reference = h->nal_ref_idc != 0;
|
|
info->frame_num = h->frame_num;
|
|
info->field_pic_flag = h->picture_structure != PICT_FRAME;
|
|
info->bottom_field_flag = h->picture_structure == PICT_BOTTOM_FIELD;
|
|
info->num_ref_frames = h->sps.ref_frame_count;
|
|
info->mb_adaptive_frame_field_flag = h->sps.mb_aff && !info->field_pic_flag;
|
|
info->constrained_intra_pred_flag = h->pps.constrained_intra_pred;
|
|
info->weighted_pred_flag = h->pps.weighted_pred;
|
|
info->weighted_bipred_idc = h->pps.weighted_bipred_idc;
|
|
info->frame_mbs_only_flag = h->sps.frame_mbs_only_flag;
|
|
info->transform_8x8_mode_flag = h->pps.transform_8x8_mode;
|
|
info->chroma_qp_index_offset = h->pps.chroma_qp_index_offset[0];
|
|
info->second_chroma_qp_index_offset = h->pps.chroma_qp_index_offset[1];
|
|
info->pic_init_qp_minus26 = h->pps.init_qp - 26;
|
|
info->num_ref_idx_l0_active_minus1 = h->pps.ref_count[0] - 1;
|
|
info->num_ref_idx_l1_active_minus1 = h->pps.ref_count[1] - 1;
|
|
info->log2_max_frame_num_minus4 = h->sps.log2_max_frame_num - 4;
|
|
info->pic_order_cnt_type = h->sps.poc_type;
|
|
info->log2_max_pic_order_cnt_lsb_minus4 = h->sps.poc_type ? 0 : h->sps.log2_max_poc_lsb - 4;
|
|
info->delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
|
|
info->direct_8x8_inference_flag = h->sps.direct_8x8_inference_flag;
|
|
info->entropy_coding_mode_flag = h->pps.cabac;
|
|
info->pic_order_present_flag = h->pps.pic_order_present;
|
|
info->deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
|
|
info->redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
|
|
|
|
memcpy(info->scaling_lists_4x4, h->pps.scaling_matrix4,
|
|
sizeof(info->scaling_lists_4x4));
|
|
memcpy(info->scaling_lists_8x8[0], h->pps.scaling_matrix8[0],
|
|
sizeof(info->scaling_lists_8x8[0]));
|
|
memcpy(info->scaling_lists_8x8[1], h->pps.scaling_matrix8[3],
|
|
sizeof(info->scaling_lists_8x8[1]));
|
|
|
|
vdpau_h264_set_reference_frames(avctx);
|
|
|
|
return ff_vdpau_common_start_frame(avctx, buffer, size);
|
|
}
|
|
|
|
static const uint8_t start_code_prefix[3] = { 0x00, 0x00, 0x01 };
|
|
|
|
static int vdpau_h264_decode_slice(AVCodecContext *avctx,
|
|
const uint8_t *buffer, uint32_t size)
|
|
{
|
|
AVVDPAUContext *hwctx = avctx->hwaccel_context;
|
|
int val;
|
|
|
|
val = ff_vdpau_add_buffer(avctx, start_code_prefix, 3);
|
|
if (val)
|
|
return val;
|
|
|
|
val = ff_vdpau_add_buffer(avctx, buffer, size);
|
|
if (val)
|
|
return val;
|
|
|
|
hwctx->info.h264.slice_count++;
|
|
return 0;
|
|
}
|
|
|
|
static int vdpau_h264_end_frame(AVCodecContext *avctx)
|
|
{
|
|
AVVDPAUContext *hwctx = avctx->hwaccel_context;
|
|
H264Context *h = avctx->priv_data;
|
|
VdpVideoSurface surf = ff_vdpau_get_surface_id(h->cur_pic_ptr);
|
|
|
|
hwctx->render(hwctx->decoder, surf, (void *)&hwctx->info,
|
|
hwctx->bitstream_buffers_used, hwctx->bitstream_buffers);
|
|
|
|
ff_h264_draw_horiz_band(h, 0, h->avctx->height);
|
|
hwctx->bitstream_buffers_used = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVHWAccel ff_h264_vdpau_hwaccel = {
|
|
.name = "h264_vdpau",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_H264,
|
|
.pix_fmt = AV_PIX_FMT_VDPAU,
|
|
.start_frame = vdpau_h264_start_frame,
|
|
.end_frame = vdpau_h264_end_frame,
|
|
.decode_slice = vdpau_h264_decode_slice,
|
|
};
|