Commit 2a4d34d4 authored by Mark Thompson's avatar Mark Thompson

lavc: Delete all fake hwaccels

They are now unused.
parent 433522a1
...@@ -2183,8 +2183,6 @@ h264_d3d11va2_hwaccel_deps="d3d11va" ...@@ -2183,8 +2183,6 @@ h264_d3d11va2_hwaccel_deps="d3d11va"
h264_d3d11va2_hwaccel_select="h264_decoder" h264_d3d11va2_hwaccel_select="h264_decoder"
h264_dxva2_hwaccel_deps="dxva2" h264_dxva2_hwaccel_deps="dxva2"
h264_dxva2_hwaccel_select="h264_decoder" h264_dxva2_hwaccel_select="h264_decoder"
h264_mmal_hwaccel_deps="mmal"
h264_qsv_hwaccel_deps="libmfx"
h264_vaapi_hwaccel_deps="vaapi" h264_vaapi_hwaccel_deps="vaapi"
h264_vaapi_hwaccel_select="h264_decoder" h264_vaapi_hwaccel_select="h264_decoder"
h264_vda_hwaccel_deps="vda" h264_vda_hwaccel_deps="vda"
...@@ -2201,7 +2199,6 @@ hevc_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_HEVC" ...@@ -2201,7 +2199,6 @@ hevc_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
hevc_d3d11va2_hwaccel_select="hevc_decoder" hevc_d3d11va2_hwaccel_select="hevc_decoder"
hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
hevc_dxva2_hwaccel_select="hevc_decoder" hevc_dxva2_hwaccel_select="hevc_decoder"
hevc_qsv_hwaccel_deps="libmfx"
hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC" hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"
hevc_vaapi_hwaccel_select="hevc_decoder" hevc_vaapi_hwaccel_select="hevc_decoder"
hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
...@@ -2214,8 +2211,6 @@ mpeg2_d3d11va2_hwaccel_deps="d3d11va" ...@@ -2214,8 +2211,6 @@ mpeg2_d3d11va2_hwaccel_deps="d3d11va"
mpeg2_d3d11va2_hwaccel_select="mpeg2video_decoder" mpeg2_d3d11va2_hwaccel_select="mpeg2video_decoder"
mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_deps="dxva2"
mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
mpeg2_mmal_hwaccel_deps="mmal"
mpeg2_qsv_hwaccel_deps="libmfx"
mpeg2_vaapi_hwaccel_deps="vaapi" mpeg2_vaapi_hwaccel_deps="vaapi"
mpeg2_vaapi_hwaccel_select="mpeg2video_decoder" mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
mpeg2_vdpau_hwaccel_deps="vdpau" mpeg2_vdpau_hwaccel_deps="vdpau"
...@@ -2230,13 +2225,10 @@ vc1_d3d11va2_hwaccel_deps="d3d11va" ...@@ -2230,13 +2225,10 @@ vc1_d3d11va2_hwaccel_deps="d3d11va"
vc1_d3d11va2_hwaccel_select="vc1_decoder" vc1_d3d11va2_hwaccel_select="vc1_decoder"
vc1_dxva2_hwaccel_deps="dxva2" vc1_dxva2_hwaccel_deps="dxva2"
vc1_dxva2_hwaccel_select="vc1_decoder" vc1_dxva2_hwaccel_select="vc1_decoder"
vc1_mmal_hwaccel_deps="mmal"
vc1_qsv_hwaccel_deps="libmfx"
vc1_vaapi_hwaccel_deps="vaapi" vc1_vaapi_hwaccel_deps="vaapi"
vc1_vaapi_hwaccel_select="vc1_decoder" vc1_vaapi_hwaccel_select="vc1_decoder"
vc1_vdpau_hwaccel_deps="vdpau" vc1_vdpau_hwaccel_deps="vdpau"
vc1_vdpau_hwaccel_select="vc1_decoder" vc1_vdpau_hwaccel_select="vc1_decoder"
vp8_qsv_hwaccel_deps="libmfx"
vp8_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVP8" vp8_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVP8"
vp8_vaapi_hwaccel_select="vp8_decoder" vp8_vaapi_hwaccel_select="vp8_decoder"
wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel" wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
...@@ -2261,12 +2253,12 @@ scale_npp_filter_deps="cuda libnpp" ...@@ -2261,12 +2253,12 @@ scale_npp_filter_deps="cuda libnpp"
h264_mmal_decoder_deps="mmal" h264_mmal_decoder_deps="mmal"
h264_nvenc_encoder_deps="nvenc" h264_nvenc_encoder_deps="nvenc"
h264_omx_encoder_deps="omx" h264_omx_encoder_deps="omx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec"
h264_qsv_encoder_select="qsvenc" h264_qsv_encoder_select="qsvenc"
h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264" h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
h264_vaapi_encoder_select="cbs_h264 vaapi_encode" h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
hevc_nvenc_encoder_deps="nvenc" hevc_nvenc_encoder_deps="nvenc"
hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec" hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec"
hevc_qsv_encoder_select="hevcparse qsvenc" hevc_qsv_encoder_select="hevcparse qsvenc"
hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
hevc_vaapi_encoder_select="cbs_h265 vaapi_encode" hevc_vaapi_encoder_select="cbs_h265 vaapi_encode"
...@@ -2275,14 +2267,14 @@ mjpeg_qsv_encoder_select="qsvenc" ...@@ -2275,14 +2267,14 @@ mjpeg_qsv_encoder_select="qsvenc"
mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG" mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
mjpeg_vaapi_encoder_select="vaapi_encode jpegtables" mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
mpeg2_mmal_decoder_deps="mmal" mpeg2_mmal_decoder_deps="mmal"
mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser" mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser"
mpeg2_qsv_encoder_select="qsvenc" mpeg2_qsv_encoder_select="qsvenc"
mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2" mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode" mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"
mpeg4_omx_encoder_deps="omx" mpeg4_omx_encoder_deps="omx"
vc1_mmal_decoder_deps="mmal" vc1_mmal_decoder_deps="mmal"
vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser" vc1_qsv_decoder_select="qsvdec vc1_parser"
vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser" vp8_qsv_decoder_select="qsvdec vp8_parser"
vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
vp8_vaapi_encoder_select="vaapi_encode" vp8_vaapi_encoder_select="vaapi_encode"
vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9" vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9"
......
...@@ -788,27 +788,6 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -788,27 +788,6 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame,
return ret; return ret;
} }
AVHWAccel ff_h264_mmal_hwaccel = {
.name = "h264_mmal",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264,
.pix_fmt = AV_PIX_FMT_MMAL,
};
AVHWAccel ff_mpeg2_mmal_hwaccel = {
.name = "mpeg2_mmal",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO,
.pix_fmt = AV_PIX_FMT_MMAL,
};
AVHWAccel ff_vc1_mmal_hwaccel = {
.name = "vc1_mmal",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1,
.pix_fmt = AV_PIX_FMT_MMAL,
};
static const AVCodecHWConfigInternal *mmal_hw_configs = { static const AVCodecHWConfigInternal *mmal_hw_configs = {
HW_CONFIG_INTERNAL(MMAL), HW_CONFIG_INTERNAL(MMAL),
NULL NULL
......
...@@ -180,15 +180,6 @@ static void qsv_decode_flush(AVCodecContext *avctx) ...@@ -180,15 +180,6 @@ static void qsv_decode_flush(AVCodecContext *avctx)
#define OFFSET(x) offsetof(QSVH2645Context, x) #define OFFSET(x) offsetof(QSVH2645Context, x)
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
#if CONFIG_HEVC_QSV_HWACCEL
AVHWAccel ff_hevc_qsv_hwaccel = {
.name = "hevc_qsv",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC,
.pix_fmt = AV_PIX_FMT_QSV,
};
#endif
#if CONFIG_HEVC_QSV_DECODER #if CONFIG_HEVC_QSV_DECODER
static const AVOption hevc_options[] = { static const AVOption hevc_options[] = {
{ "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD }, { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD },
...@@ -232,15 +223,6 @@ AVCodec ff_hevc_qsv_decoder = { ...@@ -232,15 +223,6 @@ AVCodec ff_hevc_qsv_decoder = {
}; };
#endif #endif
#if CONFIG_H264_QSV_HWACCEL
AVHWAccel ff_h264_qsv_hwaccel = {
.name = "h264_qsv",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264,
.pix_fmt = AV_PIX_FMT_QSV,
};
#endif
#if CONFIG_H264_QSV_DECODER #if CONFIG_H264_QSV_DECODER
static const AVOption options[] = { static const AVOption options[] = {
{ "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD }, { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD },
......
...@@ -163,15 +163,6 @@ static const AVOption options[] = { ...@@ -163,15 +163,6 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
#if CONFIG_MPEG2_QSV_HWACCEL
AVHWAccel ff_mpeg2_qsv_hwaccel = {
.name = "mpeg2_qsv",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO,
.pix_fmt = AV_PIX_FMT_QSV,
};
#endif
#if CONFIG_MPEG2_QSV_DECODER #if CONFIG_MPEG2_QSV_DECODER
static const AVClass mpeg2_qsv_class = { static const AVClass mpeg2_qsv_class = {
.class_name = "mpeg2_qsv", .class_name = "mpeg2_qsv",
...@@ -200,15 +191,6 @@ AVCodec ff_mpeg2_qsv_decoder = { ...@@ -200,15 +191,6 @@ AVCodec ff_mpeg2_qsv_decoder = {
}; };
#endif #endif
#if CONFIG_VC1_QSV_HWACCEL
AVHWAccel ff_vc1_qsv_hwaccel = {
.name = "vc1_qsv",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VC1,
.pix_fmt = AV_PIX_FMT_QSV,
};
#endif
#if CONFIG_VC1_QSV_DECODER #if CONFIG_VC1_QSV_DECODER
static const AVClass vc1_qsv_class = { static const AVClass vc1_qsv_class = {
.class_name = "vc1_qsv", .class_name = "vc1_qsv",
...@@ -237,15 +219,6 @@ AVCodec ff_vc1_qsv_decoder = { ...@@ -237,15 +219,6 @@ AVCodec ff_vc1_qsv_decoder = {
}; };
#endif #endif
#if CONFIG_VP8_QSV_HWACCEL
AVHWAccel ff_vp8_qsv_hwaccel = {
.name = "vp8_qsv",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP8,
.pix_fmt = AV_PIX_FMT_QSV,
};
#endif
#if CONFIG_VP8_QSV_DECODER #if CONFIG_VP8_QSV_DECODER
static const AVClass vp8_qsv_class = { static const AVClass vp8_qsv_class = {
.class_name = "vp8_qsv", .class_name = "vp8_qsv",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment