From a05aa821b67d48a008e0f470fd2f9656603d40f5 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 24 Feb 2009 19:04:43 +0000
Subject: [PATCH] add ff_find_hwaccel() by Gwenole Beauchesne
Originally committed as revision 17569 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h263dec.c | 1 +
libavcodec/h264.c | 1 +
libavcodec/internal.h | 13 +++++++++++++
libavcodec/mpeg12.c | 2 ++
4 files changed, 17 insertions(+)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 7fb9cb00f56..bb42d495fa4 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -106,6 +106,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
return -1;
}
s->codec_id= avctx->codec->id;
+ avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
/* for h263, we allocate the images after having read the header */
if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f5d2a8082ac..89f9978b2b2 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2182,6 +2182,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
avctx->pix_fmt= PIX_FMT_VDPAU_H264;
else
avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts);
+ avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
decode_init_vlc();
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index a8bed35f2d6..9f40538db51 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -24,6 +24,9 @@
#ifndef AVCODEC_INTERNAL_H
#define AVCODEC_INTERNAL_H
+#include <stdint.h>
+#include "avcodec.h"
+
/**
* Logs a generic warning message about a missing feature.
* @param[in] avc a pointer to an arbitrary struct of which the first field is
@@ -44,4 +47,14 @@ void ff_log_missing_feature(void *avc, const char *feature, int want_sample);
*/
void ff_log_ask_for_sample(void *avc, const char *msg);
+/**
+ * Returns the hardware accelerated codec for codec \p codec_id and
+ * pixel format \p pix_fmt.
+ *
+ * @param codec_id the codec to match
+ * @param pix_fmt the pixel format to match
+ * @return the hardware accelerated codec, or NULL if none was found.
+ */
+AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt);
+
#endif /* AVCODEC_INTERNAL_H */
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 10e4632d9d3..d958ae52f30 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1302,6 +1302,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){
}//MPEG-2
avctx->pix_fmt = mpeg_get_pixelformat(avctx);
+ avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
//until then pix_fmt may be changed right after codec init
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ||
avctx->hwaccel ||
@@ -2071,6 +2072,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
s->low_delay= 1;
avctx->pix_fmt = mpeg_get_pixelformat(avctx);
+ avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU )
--
GitLab