History

lavc: Delete all fake hwaccels

They are now unused.

Mark Thompson committed 9 years ago

Commit da4e02b1 parent 9bd326a7 files · +6 −151Browse files

Unified · Split

7 files
  1. configure +5 −29
  2. libavcodec/cuviddec.c +0 −6
  3. libavcodec/mediacodec.c +1 −1
  4. libavcodec/mediacodecdec_common.c +0 −42
  5. libavcodec/mmaldec.c +0 −28
  6. libavcodec/qsvdec_h2645.c +0 −18
  7. libavcodec/qsvdec_other.c +0 −27
configure+5−29
@@ -2672,45 +2672,36 @@ h263_vaapi_hwaccel_deps="vaapi" · 2671 unmodified lines
26722672 h263_vaapi_hwaccel_select="h263_decoder"
26732673 h263_videotoolbox_hwaccel_deps="videotoolbox"
26742674 h263_videotoolbox_hwaccel_select="h263_decoder"
2675−h264_cuvid_hwaccel_select="h264_cuvid_decoder"
26762675 h264_d3d11va_hwaccel_deps="d3d11va"
26772676 h264_d3d11va_hwaccel_select="h264_decoder"
26782677 h264_d3d11va2_hwaccel_deps="d3d11va"
26792678 h264_d3d11va2_hwaccel_select="h264_decoder"
26802679 h264_dxva2_hwaccel_deps="dxva2"
26812680 h264_dxva2_hwaccel_select="h264_decoder"
2682−h264_mediacodec_hwaccel_deps="mediacodec"
2683−h264_mmal_hwaccel_deps="mmal"
26842681 h264_nvdec_hwaccel_deps="nvdec"
26852682 h264_nvdec_hwaccel_select="h264_decoder"
2686−h264_qsv_hwaccel_deps="libmfx"
26872683 h264_vaapi_hwaccel_deps="vaapi"
26882684 h264_vaapi_hwaccel_select="h264_decoder"
26892685 h264_vdpau_hwaccel_deps="vdpau"
26902686 h264_vdpau_hwaccel_select="h264_decoder"
26912687 h264_videotoolbox_hwaccel_deps="videotoolbox"
26922688 h264_videotoolbox_hwaccel_select="h264_decoder"
2693−hevc_cuvid_hwaccel_select="hevc_cuvid_decoder"
26942689 hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
26952690 hevc_d3d11va_hwaccel_select="hevc_decoder"
2696−hevc_mediacodec_hwaccel_deps="mediacodec"
26972691 hevc_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
26982692 hevc_d3d11va2_hwaccel_select="hevc_decoder"
26992693 hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
27002694 hevc_dxva2_hwaccel_select="hevc_decoder"
27012695 hevc_nvdec_hwaccel_deps="nvdec"
27022696 hevc_nvdec_hwaccel_select="hevc_decoder"
2703−hevc_qsv_hwaccel_deps="libmfx"
27042697 hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"
27052698 hevc_vaapi_hwaccel_select="hevc_decoder"
27062699 hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
27072700 hevc_vdpau_hwaccel_select="hevc_decoder"
27082701 hevc_videotoolbox_hwaccel_deps="videotoolbox"
27092702 hevc_videotoolbox_hwaccel_select="hevc_decoder"
2710−mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"
27112703 mpeg_xvmc_hwaccel_deps="xvmc"
27122704 mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
2713−mpeg1_cuvid_hwaccel_select="mpeg1_cuvid_decoder"
27142705 mpeg1_nvdec_hwaccel_deps="nvdec"
27152706 mpeg1_nvdec_hwaccel_select="mpeg1video_decoder"
27162707 mpeg1_vdpau_hwaccel_deps="vdpau"
@@ -2719,18 +2710,14 @@ mpeg1_videotoolbox_hwaccel_deps="videotoolbox" · 2 unmodified lines
27192710 mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"
27202711 mpeg1_xvmc_hwaccel_deps="xvmc"
27212712 mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
2722−mpeg2_cuvid_hwaccel_select="mpeg2_cuvid_decoder"
27232713 mpeg2_d3d11va_hwaccel_deps="d3d11va"
27242714 mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
27252715 mpeg2_d3d11va2_hwaccel_deps="d3d11va"
27262716 mpeg2_d3d11va2_hwaccel_select="mpeg2video_decoder"
27272717 mpeg2_dxva2_hwaccel_deps="dxva2"
27282718 mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
2729−mpeg2_mediacodec_hwaccel_deps="mediacodec"
2730−mpeg2_mmal_hwaccel_deps="mmal"
27312719 mpeg2_nvdec_hwaccel_deps="nvdec"
27322720 mpeg2_nvdec_hwaccel_select="mpeg2video_decoder"
2733−mpeg2_qsv_hwaccel_deps="libmfx"
27342721 mpeg2_vaapi_hwaccel_deps="vaapi"
27352722 mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
27362723 mpeg2_vdpau_hwaccel_deps="vdpau"
@@ -2739,9 +2726,6 @@ mpeg2_videotoolbox_hwaccel_deps="videotoolbox" · 2 unmodified lines
27392726 mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"
27402727 mpeg2_xvmc_hwaccel_deps="xvmc"
27412728 mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
2742−mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
2743−mpeg4_mediacodec_hwaccel_deps="mediacodec"
2744−mpeg4_mmal_hwaccel_deps="mmal"
27452729 mpeg4_nvdec_hwaccel_deps="nvdec"
27462730 mpeg4_nvdec_hwaccel_select="mpeg4_decoder"
27472731 mpeg4_vaapi_hwaccel_deps="vaapi"
@@ -2750,32 +2734,24 @@ mpeg4_vdpau_hwaccel_deps="vdpau" · 2 unmodified lines
27502734 mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
27512735 mpeg4_videotoolbox_hwaccel_deps="videotoolbox"
27522736 mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder"
2753−vc1_cuvid_hwaccel_select="vc1_cuvid_decoder"
27542737 vc1_d3d11va_hwaccel_deps="d3d11va"
27552738 vc1_d3d11va_hwaccel_select="vc1_decoder"
27562739 vc1_d3d11va2_hwaccel_deps="d3d11va"
27572740 vc1_d3d11va2_hwaccel_select="vc1_decoder"
27582741 vc1_dxva2_hwaccel_deps="dxva2"
27592742 vc1_dxva2_hwaccel_select="vc1_decoder"
2760−vc1_mmal_hwaccel_deps="mmal"
27612743 vc1_nvdec_hwaccel_deps="nvdec"
27622744 vc1_nvdec_hwaccel_select="vc1_decoder"
2763−vc1_qsv_hwaccel_deps="libmfx"
27642745 vc1_vaapi_hwaccel_deps="vaapi"
27652746 vc1_vaapi_hwaccel_select="vc1_decoder"
27662747 vc1_vdpau_hwaccel_deps="vdpau"
27672748 vc1_vdpau_hwaccel_select="vc1_decoder"
2768−vp8_cuvid_hwaccel_select="vp8_cuvid_decoder"
2769−vp9_cuvid_hwaccel_select="vp9_cuvid_decoder"
2770−vp8_mediacodec_hwaccel_deps="mediacodec"
2771−vp8_qsv_hwaccel_deps="libmfx"
27722749 vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
27732750 vp9_d3d11va_hwaccel_select="vp9_decoder"
27742751 vp9_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
27752752 vp9_d3d11va2_hwaccel_select="vp9_decoder"
27762753 vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
27772754 vp9_dxva2_hwaccel_select="vp9_decoder"
2778−vp9_mediacodec_hwaccel_deps="mediacodec"
27792755 vp9_nvdec_hwaccel_deps="nvdec"
27802756 vp9_nvdec_hwaccel_select="vp9_decoder"
27812757 vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"
@@ -2816,7 +2792,7 @@ h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser" · 34 unmodified lines
28162792 h264_mmal_decoder_deps="mmal"
28172793 h264_nvenc_encoder_deps="nvenc"
28182794 h264_omx_encoder_deps="omx"
2819−h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
2795+h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec"
28202796 h264_qsv_encoder_select="qsvenc"
28212797 h264_rkmpp_decoder_deps="rkmpp"
28222798 h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
@@ -2829,7 +2805,7 @@ hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf" · 6 unmodified lines
28292805 hevc_mediacodec_decoder_deps="mediacodec"
28302806 hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
28312807 hevc_nvenc_encoder_deps="nvenc"
2832−hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
2808+hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec"
28332809 hevc_qsv_encoder_select="hevcparse qsvenc"
28342810 hevc_rkmpp_decoder_deps="rkmpp"
28352811 hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf"
@@ -2848,7 +2824,7 @@ mpeg2_crystalhd_decoder_select="crystalhd" · 12 unmodified lines
28482824 mpeg2_cuvid_decoder_deps="cuvid"
28492825 mpeg2_mmal_decoder_deps="mmal"
28502826 mpeg2_mediacodec_decoder_deps="mediacodec"
2851−mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
2827+mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser"
28522828 mpeg2_qsv_encoder_select="qsvenc"
28532829 mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
28542830 mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"
@@ -2866,11 +2842,11 @@ nvenc_hevc_encoder_select="hevc_nvenc_encoder" · 11 unmodified lines
28662842 vc1_crystalhd_decoder_select="crystalhd"
28672843 vc1_cuvid_decoder_deps="cuvid"
28682844 vc1_mmal_decoder_deps="mmal"
2869−vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"
2845+vc1_qsv_decoder_select="qsvdec vc1_parser"
28702846 vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"
28712847 vp8_cuvid_decoder_deps="cuvid"
28722848 vp8_mediacodec_decoder_deps="mediacodec"
2873−vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"
2849+vp8_qsv_decoder_select="qsvdec vp8_parser"
28742850 vp8_rkmpp_decoder_deps="rkmpp"
28752851 vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
28762852 vp8_vaapi_encoder_select="vaapi_encode"
libavcodec/cuviddec.c+0−6
@@ -1115,12 +1115,6 @@ static const AVCodecHWConfigInternal *cuvid_hw_configs[] = { · 1114 unmodified lines
11151115 .option = options, \
11161116 .version = LIBAVUTIL_VERSION_INT, \
11171117 }; \
1118− AVHWAccel ff_##x##_cuvid_hwaccel = { \
1119− .name = #x "_cuvid", \
1120− .type = AVMEDIA_TYPE_VIDEO, \
1121− .id = AV_CODEC_ID_##X, \
1122− .pix_fmt = AV_PIX_FMT_CUDA, \
1123− }; \
11241118 AVCodec ff_##x##_cuvid_decoder = { \
11251119 .name = #x "_cuvid", \
11261120 .long_name = NULL_IF_CONFIG_SMALL("Nvidia CUVID " #X " decoder"), \
libavcodec/mediacodec.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626
2727 #include "mediacodec.h"
2828
29−#if CONFIG_H264_MEDIACODEC_HWACCEL
29+#if CONFIG_MEDIACODEC
3030
3131 #include <jni.h>
3232
libavcodec/mediacodecdec_common.c+0−42
@@ -757,45 +757,3 @@ int ff_mediacodec_dec_is_flushing(AVCodecContext *avctx, MediaCodecDecContext *s · 756 unmodified lines
757757 {
758758 return s->flushing;
759759 }
760−
761−AVHWAccel ff_h264_mediacodec_hwaccel = {
762− .name = "mediacodec",
763− .type = AVMEDIA_TYPE_VIDEO,
764− .id = AV_CODEC_ID_H264,
765− .pix_fmt = AV_PIX_FMT_MEDIACODEC,
766−};
767−
768−AVHWAccel ff_hevc_mediacodec_hwaccel = {
769− .name = "mediacodec",
770− .type = AVMEDIA_TYPE_VIDEO,
771− .id = AV_CODEC_ID_HEVC,
772− .pix_fmt = AV_PIX_FMT_MEDIACODEC,
773−};
774−
775−AVHWAccel ff_mpeg2_mediacodec_hwaccel = {
776− .name = "mediacodec",
777− .type = AVMEDIA_TYPE_VIDEO,
778− .id = AV_CODEC_ID_MPEG2VIDEO,
779− .pix_fmt = AV_PIX_FMT_MEDIACODEC,
780−};
781−
782−AVHWAccel ff_mpeg4_mediacodec_hwaccel = {
783− .name = "mediacodec",
784− .type = AVMEDIA_TYPE_VIDEO,
785− .id = AV_CODEC_ID_MPEG4,
786− .pix_fmt = AV_PIX_FMT_MEDIACODEC,
787−};
788−
789−AVHWAccel ff_vp8_mediacodec_hwaccel = {
790− .name = "mediacodec",
791− .type = AVMEDIA_TYPE_VIDEO,
792− .id = AV_CODEC_ID_VP8,
793− .pix_fmt = AV_PIX_FMT_MEDIACODEC,
794−};
795−
796−AVHWAccel ff_vp9_mediacodec_hwaccel = {
797− .name = "mediacodec",
798− .type = AVMEDIA_TYPE_VIDEO,
799− .id = AV_CODEC_ID_VP9,
800− .pix_fmt = AV_PIX_FMT_MEDIACODEC,
801−};
libavcodec/mmaldec.c+0−28
@@ -808,34 +808,6 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame, · 807 unmodified lines
808808 return ret;
809809 }
810810
811−AVHWAccel ff_h264_mmal_hwaccel = {
812− .name = "h264_mmal",
813− .type = AVMEDIA_TYPE_VIDEO,
814− .id = AV_CODEC_ID_H264,
815− .pix_fmt = AV_PIX_FMT_MMAL,
816−};
817−
818−AVHWAccel ff_mpeg2_mmal_hwaccel = {
819− .name = "mpeg2_mmal",
820− .type = AVMEDIA_TYPE_VIDEO,
821− .id = AV_CODEC_ID_MPEG2VIDEO,
822− .pix_fmt = AV_PIX_FMT_MMAL,
823−};
824−
825−AVHWAccel ff_mpeg4_mmal_hwaccel = {
826− .name = "mpeg4_mmal",
827− .type = AVMEDIA_TYPE_VIDEO,
828− .id = AV_CODEC_ID_MPEG4,
829− .pix_fmt = AV_PIX_FMT_MMAL,
830−};
831−
832−AVHWAccel ff_vc1_mmal_hwaccel = {
833− .name = "vc1_mmal",
834− .type = AVMEDIA_TYPE_VIDEO,
835− .id = AV_CODEC_ID_VC1,
836− .pix_fmt = AV_PIX_FMT_MMAL,
837−};
838−
839811 static const AVCodecHWConfigInternal *mmal_hw_configs[] = {
840812 HW_CONFIG_INTERNAL(MMAL),
841813 NULL
libavcodec/qsvdec_h2645.c+0−18
@@ -180,15 +180,6 @@ static void qsv_decode_flush(AVCodecContext *avctx) · 179 unmodified lines
180180 #define OFFSET(x) offsetof(QSVH2645Context, x)
181181 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
182182
183−#if CONFIG_HEVC_QSV_HWACCEL
184−AVHWAccel ff_hevc_qsv_hwaccel = {
185− .name = "hevc_qsv",
186− .type = AVMEDIA_TYPE_VIDEO,
187− .id = AV_CODEC_ID_HEVC,
188− .pix_fmt = AV_PIX_FMT_QSV,
189−};
190−#endif
191−
192183 #if CONFIG_HEVC_QSV_DECODER
193184 static const AVOption hevc_options[] = {
194185 { "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 },
@@ -231,15 +222,6 @@ AVCodec ff_hevc_qsv_decoder = { · 36 unmodified lines
231222 };
232223 #endif
233224
234−#if CONFIG_H264_QSV_HWACCEL
235−AVHWAccel ff_h264_qsv_hwaccel = {
236− .name = "h264_qsv",
237− .type = AVMEDIA_TYPE_VIDEO,
238− .id = AV_CODEC_ID_H264,
239− .pix_fmt = AV_PIX_FMT_QSV,
240−};
241−#endif
242−
243225 #if CONFIG_H264_QSV_DECODER
244226 static const AVOption options[] = {
245227 { "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 },
libavcodec/qsvdec_other.c+0−27
@@ -158,15 +158,6 @@ static const AVOption options[] = { · 157 unmodified lines
158158 { NULL },
159159 };
160160
161−#if CONFIG_MPEG2_QSV_HWACCEL
162−AVHWAccel ff_mpeg2_qsv_hwaccel = {
163− .name = "mpeg2_qsv",
164− .type = AVMEDIA_TYPE_VIDEO,
165− .id = AV_CODEC_ID_MPEG2VIDEO,
166− .pix_fmt = AV_PIX_FMT_QSV,
167−};
168−#endif
169−
170161 #if CONFIG_MPEG2_QSV_DECODER
171162 static const AVClass mpeg2_qsv_class = {
172163 .class_name = "mpeg2_qsv",
@@ -194,15 +185,6 @@ AVCodec ff_mpeg2_qsv_decoder = { · 21 unmodified lines
194185 };
195186 #endif
196187
197−#if CONFIG_VC1_QSV_HWACCEL
198−AVHWAccel ff_vc1_qsv_hwaccel = {
199− .name = "vc1_qsv",
200− .type = AVMEDIA_TYPE_VIDEO,
201− .id = AV_CODEC_ID_VC1,
202− .pix_fmt = AV_PIX_FMT_QSV,
203−};
204−#endif
205−
206188 #if CONFIG_VC1_QSV_DECODER
207189 static const AVClass vc1_qsv_class = {
208190 .class_name = "vc1_qsv",
@@ -230,15 +212,6 @@ AVCodec ff_vc1_qsv_decoder = { · 21 unmodified lines
230212 };
231213 #endif
232214
233−#if CONFIG_VP8_QSV_HWACCEL
234−AVHWAccel ff_vp8_qsv_hwaccel = {
235− .name = "vp8_qsv",
236− .type = AVMEDIA_TYPE_VIDEO,
237− .id = AV_CODEC_ID_VP8,
238− .pix_fmt = AV_PIX_FMT_QSV,
239−};
240−#endif
241−
242215 #if CONFIG_VP8_QSV_DECODER
243216 static const AVClass vp8_qsv_class = {
244217 .class_name = "vp8_qsv",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t