mirror of https://github.com/FFmpeg/FFmpeg.git
* commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b': vdpau: Add MPEG-4 decoding via hwaccel infrastructure vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/8/head
Michael Niedermayer
12 years ago
commit
41bdef1d39
8 changed files with 237 additions and 37 deletions
@ -0,0 +1,116 @@ |
||||
/*
|
||||
* MPEG-1/2 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 "vdpau.h" |
||||
#include "vdpau_internal.h" |
||||
|
||||
static int vdpau_mpeg_start_frame(AVCodecContext *avctx, |
||||
const uint8_t *buffer, uint32_t size) |
||||
{ |
||||
MpegEncContext * const s = avctx->priv_data; |
||||
AVVDPAUContext *hwctx = avctx->hwaccel_context; |
||||
VdpPictureInfoMPEG1Or2 *info = &hwctx->info.mpeg; |
||||
VdpVideoSurface ref; |
||||
int i; |
||||
|
||||
/* fill VdpPictureInfoMPEG1Or2 struct */ |
||||
info->forward_reference = VDP_INVALID_HANDLE; |
||||
info->backward_reference = VDP_INVALID_HANDLE; |
||||
|
||||
switch (s->pict_type) { |
||||
case AV_PICTURE_TYPE_B: |
||||
ref = ff_vdpau_get_surface_id(&s->next_picture); |
||||
assert(ref != VDP_INVALID_HANDLE); |
||||
hwctx->info.mpeg.backward_reference = ref; |
||||
/* fall through to forward prediction */ |
||||
case AV_PICTURE_TYPE_P: |
||||
ref = ff_vdpau_get_surface_id(&s->last_picture); |
||||
hwctx->info.mpeg.forward_reference = ref; |
||||
} |
||||
|
||||
info->slice_count = 0; |
||||
info->picture_structure = s->picture_structure; |
||||
info->picture_coding_type = s->pict_type; |
||||
info->intra_dc_precision = s->intra_dc_precision; |
||||
info->frame_pred_frame_dct = s->frame_pred_frame_dct; |
||||
info->concealment_motion_vectors = s->concealment_motion_vectors; |
||||
info->intra_vlc_format = s->intra_vlc_format; |
||||
info->alternate_scan = s->alternate_scan; |
||||
info->q_scale_type = s->q_scale_type; |
||||
info->top_field_first = s->top_field_first; |
||||
// Both for MPEG-1 only, zero for MPEG-2:
|
||||
info->full_pel_forward_vector = s->full_pel[0]; |
||||
info->full_pel_backward_vector = s->full_pel[1]; |
||||
// For MPEG-1 fill both horizontal & vertical:
|
||||
info->f_code[0][0] = s->mpeg_f_code[0][0]; |
||||
info->f_code[0][1] = s->mpeg_f_code[0][1]; |
||||
info->f_code[1][0] = s->mpeg_f_code[1][0]; |
||||
info->f_code[1][1] = s->mpeg_f_code[1][1]; |
||||
for (i = 0; i < 64; ++i) { |
||||
info->intra_quantizer_matrix[i] = s->intra_matrix[i]; |
||||
info->non_intra_quantizer_matrix[i] = s->inter_matrix[i]; |
||||
} |
||||
|
||||
return ff_vdpau_common_start_frame(avctx, buffer, size); |
||||
} |
||||
|
||||
static int vdpau_mpeg_decode_slice(AVCodecContext *avctx, |
||||
const uint8_t *buffer, uint32_t size) |
||||
{ |
||||
AVVDPAUContext *hwctx = avctx->hwaccel_context; |
||||
int val; |
||||
|
||||
val = ff_vdpau_add_buffer(avctx, buffer, size); |
||||
if (val < 0) |
||||
return val; |
||||
|
||||
hwctx->info.mpeg.slice_count++; |
||||
return 0; |
||||
} |
||||
|
||||
#if CONFIG_MPEG1_VDPAU_HWACCEL |
||||
AVHWAccel ff_mpeg1_vdpau_hwaccel = { |
||||
.name = "mpeg1_vdpau", |
||||
.type = AVMEDIA_TYPE_VIDEO, |
||||
.id = AV_CODEC_ID_MPEG1VIDEO, |
||||
.pix_fmt = AV_PIX_FMT_VDPAU, |
||||
.start_frame = vdpau_mpeg_start_frame, |
||||
.end_frame = ff_vdpau_common_end_frame, |
||||
.decode_slice = vdpau_mpeg_decode_slice, |
||||
}; |
||||
#endif |
||||
|
||||
#if CONFIG_MPEG2_VDPAU_HWACCEL |
||||
AVHWAccel ff_mpeg2_vdpau_hwaccel = { |
||||
.name = "mpeg2_vdpau", |
||||
.type = AVMEDIA_TYPE_VIDEO, |
||||
.id = AV_CODEC_ID_MPEG2VIDEO, |
||||
.pix_fmt = AV_PIX_FMT_VDPAU, |
||||
.start_frame = vdpau_mpeg_start_frame, |
||||
.end_frame = ff_vdpau_common_end_frame, |
||||
.decode_slice = vdpau_mpeg_decode_slice, |
||||
}; |
||||
#endif |
||||
@ -0,0 +1,110 @@ |
||||
/*
|
||||
* MPEG-4 Part 2 / H.263 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 "vdpau.h" |
||||
#include "vdpau_internal.h" |
||||
|
||||
static int vdpau_mpeg4_start_frame(AVCodecContext *avctx, |
||||
const uint8_t *buffer, uint32_t size) |
||||
{ |
||||
MpegEncContext * const s = avctx->priv_data; |
||||
AVVDPAUContext *hwctx = avctx->hwaccel_context; |
||||
VdpPictureInfoMPEG4Part2 *info = &hwctx->info.mpeg4; |
||||
VdpVideoSurface ref; |
||||
int i; |
||||
|
||||
/* fill VdpPictureInfoMPEG4Part2 struct */ |
||||
info->forward_reference = VDP_INVALID_HANDLE; |
||||
info->backward_reference = VDP_INVALID_HANDLE; |
||||
info->vop_coding_type = 0; |
||||
|
||||
switch (s->pict_type) { |
||||
case AV_PICTURE_TYPE_B: |
||||
ref = ff_vdpau_get_surface_id(&s->next_picture); |
||||
assert(ref != VDP_INVALID_HANDLE); |
||||
info->backward_reference = ref; |
||||
info->vop_coding_type = 2; |
||||
/* fall-through */ |
||||
case AV_PICTURE_TYPE_P: |
||||
ref = ff_vdpau_get_surface_id(&s->last_picture); |
||||
assert(ref != VDP_INVALID_HANDLE); |
||||
info->forward_reference = ref; |
||||
} |
||||
|
||||
info->trd[0] = s->pp_time; |
||||
info->trb[0] = s->pb_time; |
||||
info->trd[1] = s->pp_field_time >> 1; |
||||
info->trb[1] = s->pb_field_time >> 1; |
||||
info->vop_time_increment_resolution = s->avctx->time_base.den; |
||||
info->vop_fcode_forward = s->f_code; |
||||
info->vop_fcode_backward = s->b_code; |
||||
info->resync_marker_disable = !s->resync_marker; |
||||
info->interlaced = !s->progressive_sequence; |
||||
info->quant_type = s->mpeg_quant; |
||||
info->quarter_sample = s->quarter_sample; |
||||
info->short_video_header = avctx->codec->id == AV_CODEC_ID_H263; |
||||
info->rounding_control = s->no_rounding; |
||||
info->alternate_vertical_scan_flag = s->alternate_scan; |
||||
info->top_field_first = s->top_field_first; |
||||
for (i = 0; i < 64; ++i) { |
||||
info->intra_quantizer_matrix[i] = s->intra_matrix[i]; |
||||
info->non_intra_quantizer_matrix[i] = s->inter_matrix[i]; |
||||
} |
||||
|
||||
ff_vdpau_common_start_frame(avctx, buffer, size); |
||||
return ff_vdpau_add_buffer(avctx, buffer, size); |
||||
} |
||||
|
||||
static int vdpau_mpeg4_decode_slice(av_unused AVCodecContext *avctx, |
||||
av_unused const uint8_t *buffer, |
||||
av_unused uint32_t size) |
||||
{ |
||||
return 0; |
||||
} |
||||
|
||||
#if CONFIG_H263_VDPAU_HWACCEL |
||||
AVHWAccel ff_h263_vdpau_hwaccel = { |
||||
.name = "h263_vdpau", |
||||
.type = AVMEDIA_TYPE_VIDEO, |
||||
.id = AV_CODEC_ID_H263, |
||||
.pix_fmt = AV_PIX_FMT_VDPAU, |
||||
.start_frame = vdpau_mpeg4_start_frame, |
||||
.end_frame = ff_vdpau_common_end_frame, |
||||
.decode_slice = vdpau_mpeg4_decode_slice, |
||||
}; |
||||
#endif |
||||
|
||||
#if CONFIG_MPEG4_VDPAU_HWACCEL |
||||
AVHWAccel ff_mpeg4_vdpau_hwaccel = { |
||||
.name = "mpeg4_vdpau", |
||||
.type = AVMEDIA_TYPE_VIDEO, |
||||
.id = AV_CODEC_ID_MPEG4, |
||||
.pix_fmt = AV_PIX_FMT_VDPAU, |
||||
.start_frame = vdpau_mpeg4_start_frame, |
||||
.end_frame = ff_vdpau_common_end_frame, |
||||
.decode_slice = vdpau_mpeg4_decode_slice, |
||||
}; |
||||
#endif |
||||
Loading…
Reference in new issue