[FFmpeg-cvslog] vdpau: Add MPEG-4 decoding via hwaccel infrastructure
Rémi Denis-Courmont
git at videolan.org
Mon Jan 14 13:54:42 CET 2013
ffmpeg | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 12 17:53:45 2013 +0200| [200e8ac92007bc2fe30da05d3bd00ab620842a6b] | committer: Diego Biurrun
vdpau: Add MPEG-4 decoding via hwaccel infrastructure
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=200e8ac92007bc2fe30da05d3bd00ab620842a6b
---
configure | 2 +
libavcodec/Makefile | 2 +
libavcodec/allcodecs.c | 2 +
libavcodec/vdpau_mpeg4.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
5 files changed, 117 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 952499f..8f21a49 100755
--- a/configure
+++ b/configure
@@ -1602,6 +1602,7 @@ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
h263_vaapi_hwaccel_select="vaapi h263_decoder"
+h263_vdpau_hwaccel_select="vdpau h263_decoder"
h264_dxva2_hwaccel_deps="dxva2api_h"
h264_dxva2_hwaccel_select="dxva2 h264_decoder"
h264_vaapi_hwaccel_select="vaapi h264_decoder"
@@ -1616,6 +1617,7 @@ mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder"
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
+mpeg4_vdpau_hwaccel_select="vdpau mpeg4_decoder"
vc1_dxva2_hwaccel_deps="dxva2api_h"
vc1_dxva2_hwaccel_select="dxva2 vc1_decoder"
vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2934097..e7f1233 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -189,6 +189,7 @@ OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \
mpeg4video.o mpeg4videodec.o flvdec.o\
intelh263dec.o
OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o
+OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o
OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \
h263.o ituh263enc.o flvenc.o
OBJS-$(CONFIG_H264_DECODER) += h264.o \
@@ -254,6 +255,7 @@ OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o
OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o
+OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o
OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \
h263.o ituh263dec.o mpeg4videodec.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index e97dce6..0bb9976 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -74,6 +74,7 @@ void avcodec_register_all(void)
/* hardware accelerators */
REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);
+ REGISTER_HWACCEL(H263_VDPAU, h263_vdpau);
REGISTER_HWACCEL(H264_DXVA2, h264_dxva2);
REGISTER_HWACCEL(H264_VAAPI, h264_vaapi);
REGISTER_HWACCEL(H264_VDA, h264_vda);
@@ -82,6 +83,7 @@ void avcodec_register_all(void)
REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);
REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);
REGISTER_HWACCEL(MPEG4_VAAPI, mpeg4_vaapi);
+ REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau);
REGISTER_HWACCEL(VC1_DXVA2, vc1_dxva2);
REGISTER_HWACCEL(VC1_VAAPI, vc1_vaapi);
REGISTER_HWACCEL(WMV3_DXVA2, wmv3_dxva2);
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
new file mode 100644
index 0000000..706e2b6
--- /dev/null
+++ b/libavcodec/vdpau_mpeg4.c
@@ -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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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
diff --git a/libavcodec/version.h b/libavcodec/version.h
index fbb80a6..856455f 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,7 +27,7 @@
*/
#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 37
+#define LIBAVCODEC_VERSION_MINOR 38
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list