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
2672h263_vaapi_hwaccel_select="h263_decoder"2672h263_vaapi_hwaccel_select="h263_decoder"
2673h263_videotoolbox_hwaccel_deps="videotoolbox"2673h263_videotoolbox_hwaccel_deps="videotoolbox"
2674h263_videotoolbox_hwaccel_select="h263_decoder"2674h263_videotoolbox_hwaccel_select="h263_decoder"
2675h264_cuvid_hwaccel_select="h264_cuvid_decoder"
2676h264_d3d11va_hwaccel_deps="d3d11va"2675h264_d3d11va_hwaccel_deps="d3d11va"
2677h264_d3d11va_hwaccel_select="h264_decoder"2676h264_d3d11va_hwaccel_select="h264_decoder"
2678h264_d3d11va2_hwaccel_deps="d3d11va"2677h264_d3d11va2_hwaccel_deps="d3d11va"
2679h264_d3d11va2_hwaccel_select="h264_decoder"2678h264_d3d11va2_hwaccel_select="h264_decoder"
2680h264_dxva2_hwaccel_deps="dxva2"2679h264_dxva2_hwaccel_deps="dxva2"
2681h264_dxva2_hwaccel_select="h264_decoder"2680h264_dxva2_hwaccel_select="h264_decoder"
2682h264_mediacodec_hwaccel_deps="mediacodec"
2683h264_mmal_hwaccel_deps="mmal"
2684h264_nvdec_hwaccel_deps="nvdec"2681h264_nvdec_hwaccel_deps="nvdec"
2685h264_nvdec_hwaccel_select="h264_decoder"2682h264_nvdec_hwaccel_select="h264_decoder"
2686h264_qsv_hwaccel_deps="libmfx"
2687h264_vaapi_hwaccel_deps="vaapi"2683h264_vaapi_hwaccel_deps="vaapi"
2688h264_vaapi_hwaccel_select="h264_decoder"2684h264_vaapi_hwaccel_select="h264_decoder"
2689h264_vdpau_hwaccel_deps="vdpau"2685h264_vdpau_hwaccel_deps="vdpau"
2690h264_vdpau_hwaccel_select="h264_decoder"2686h264_vdpau_hwaccel_select="h264_decoder"
2691h264_videotoolbox_hwaccel_deps="videotoolbox"2687h264_videotoolbox_hwaccel_deps="videotoolbox"
2692h264_videotoolbox_hwaccel_select="h264_decoder"2688h264_videotoolbox_hwaccel_select="h264_decoder"
2693hevc_cuvid_hwaccel_select="hevc_cuvid_decoder"
2694hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"2689hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
2695hevc_d3d11va_hwaccel_select="hevc_decoder"2690hevc_d3d11va_hwaccel_select="hevc_decoder"
2696hevc_mediacodec_hwaccel_deps="mediacodec"
2697hevc_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"2691hevc_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
2698hevc_d3d11va2_hwaccel_select="hevc_decoder"2692hevc_d3d11va2_hwaccel_select="hevc_decoder"
2699hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"2693hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
2700hevc_dxva2_hwaccel_select="hevc_decoder"2694hevc_dxva2_hwaccel_select="hevc_decoder"
2701hevc_nvdec_hwaccel_deps="nvdec"2695hevc_nvdec_hwaccel_deps="nvdec"
2702hevc_nvdec_hwaccel_select="hevc_decoder"2696hevc_nvdec_hwaccel_select="hevc_decoder"
2703hevc_qsv_hwaccel_deps="libmfx"
2704hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"2697hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"
2705hevc_vaapi_hwaccel_select="hevc_decoder"2698hevc_vaapi_hwaccel_select="hevc_decoder"
2706hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"2699hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
2707hevc_vdpau_hwaccel_select="hevc_decoder"2700hevc_vdpau_hwaccel_select="hevc_decoder"
2708hevc_videotoolbox_hwaccel_deps="videotoolbox"2701hevc_videotoolbox_hwaccel_deps="videotoolbox"
2709hevc_videotoolbox_hwaccel_select="hevc_decoder"2702hevc_videotoolbox_hwaccel_select="hevc_decoder"
2710mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"
2711mpeg_xvmc_hwaccel_deps="xvmc"2703mpeg_xvmc_hwaccel_deps="xvmc"
2712mpeg_xvmc_hwaccel_select="mpeg2video_decoder"2704mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
2713mpeg1_cuvid_hwaccel_select="mpeg1_cuvid_decoder"
2714mpeg1_nvdec_hwaccel_deps="nvdec"2705mpeg1_nvdec_hwaccel_deps="nvdec"
2715mpeg1_nvdec_hwaccel_select="mpeg1video_decoder"2706mpeg1_nvdec_hwaccel_select="mpeg1video_decoder"
2716mpeg1_vdpau_hwaccel_deps="vdpau"2707mpeg1_vdpau_hwaccel_deps="vdpau"
@@ -2719,18 +2710,14 @@ mpeg1_videotoolbox_hwaccel_deps="videotoolbox" · 2 unmodified lines
2719mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"2710mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"
2720mpeg1_xvmc_hwaccel_deps="xvmc"2711mpeg1_xvmc_hwaccel_deps="xvmc"
2721mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"2712mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
2722mpeg2_cuvid_hwaccel_select="mpeg2_cuvid_decoder"
2723mpeg2_d3d11va_hwaccel_deps="d3d11va"2713mpeg2_d3d11va_hwaccel_deps="d3d11va"
2724mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"2714mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
2725mpeg2_d3d11va2_hwaccel_deps="d3d11va"2715mpeg2_d3d11va2_hwaccel_deps="d3d11va"
2726mpeg2_d3d11va2_hwaccel_select="mpeg2video_decoder"2716mpeg2_d3d11va2_hwaccel_select="mpeg2video_decoder"
2727mpeg2_dxva2_hwaccel_deps="dxva2"2717mpeg2_dxva2_hwaccel_deps="dxva2"
2728mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"2718mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
2729mpeg2_mediacodec_hwaccel_deps="mediacodec"
2730mpeg2_mmal_hwaccel_deps="mmal"
2731mpeg2_nvdec_hwaccel_deps="nvdec"2719mpeg2_nvdec_hwaccel_deps="nvdec"
2732mpeg2_nvdec_hwaccel_select="mpeg2video_decoder"2720mpeg2_nvdec_hwaccel_select="mpeg2video_decoder"
2733mpeg2_qsv_hwaccel_deps="libmfx"
2734mpeg2_vaapi_hwaccel_deps="vaapi"2721mpeg2_vaapi_hwaccel_deps="vaapi"
2735mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"2722mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
2736mpeg2_vdpau_hwaccel_deps="vdpau"2723mpeg2_vdpau_hwaccel_deps="vdpau"
@@ -2739,9 +2726,6 @@ mpeg2_videotoolbox_hwaccel_deps="videotoolbox" · 2 unmodified lines
2739mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"2726mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"
2740mpeg2_xvmc_hwaccel_deps="xvmc"2727mpeg2_xvmc_hwaccel_deps="xvmc"
2741mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"2728mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
2742mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
2743mpeg4_mediacodec_hwaccel_deps="mediacodec"
2744mpeg4_mmal_hwaccel_deps="mmal"
2745mpeg4_nvdec_hwaccel_deps="nvdec"2729mpeg4_nvdec_hwaccel_deps="nvdec"
2746mpeg4_nvdec_hwaccel_select="mpeg4_decoder"2730mpeg4_nvdec_hwaccel_select="mpeg4_decoder"
2747mpeg4_vaapi_hwaccel_deps="vaapi"2731mpeg4_vaapi_hwaccel_deps="vaapi"
@@ -2750,32 +2734,24 @@ mpeg4_vdpau_hwaccel_deps="vdpau" · 2 unmodified lines
2750mpeg4_vdpau_hwaccel_select="mpeg4_decoder"2734mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
2751mpeg4_videotoolbox_hwaccel_deps="videotoolbox"2735mpeg4_videotoolbox_hwaccel_deps="videotoolbox"
2752mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder"2736mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder"
2753vc1_cuvid_hwaccel_select="vc1_cuvid_decoder"
2754vc1_d3d11va_hwaccel_deps="d3d11va"2737vc1_d3d11va_hwaccel_deps="d3d11va"
2755vc1_d3d11va_hwaccel_select="vc1_decoder"2738vc1_d3d11va_hwaccel_select="vc1_decoder"
2756vc1_d3d11va2_hwaccel_deps="d3d11va"2739vc1_d3d11va2_hwaccel_deps="d3d11va"
2757vc1_d3d11va2_hwaccel_select="vc1_decoder"2740vc1_d3d11va2_hwaccel_select="vc1_decoder"
2758vc1_dxva2_hwaccel_deps="dxva2"2741vc1_dxva2_hwaccel_deps="dxva2"
2759vc1_dxva2_hwaccel_select="vc1_decoder"2742vc1_dxva2_hwaccel_select="vc1_decoder"
2760vc1_mmal_hwaccel_deps="mmal"
2761vc1_nvdec_hwaccel_deps="nvdec"2743vc1_nvdec_hwaccel_deps="nvdec"
2762vc1_nvdec_hwaccel_select="vc1_decoder"2744vc1_nvdec_hwaccel_select="vc1_decoder"
2763vc1_qsv_hwaccel_deps="libmfx"
2764vc1_vaapi_hwaccel_deps="vaapi"2745vc1_vaapi_hwaccel_deps="vaapi"
2765vc1_vaapi_hwaccel_select="vc1_decoder"2746vc1_vaapi_hwaccel_select="vc1_decoder"
2766vc1_vdpau_hwaccel_deps="vdpau"2747vc1_vdpau_hwaccel_deps="vdpau"
2767vc1_vdpau_hwaccel_select="vc1_decoder"2748vc1_vdpau_hwaccel_select="vc1_decoder"
2768vp8_cuvid_hwaccel_select="vp8_cuvid_decoder"
2769vp9_cuvid_hwaccel_select="vp9_cuvid_decoder"
2770vp8_mediacodec_hwaccel_deps="mediacodec"
2771vp8_qsv_hwaccel_deps="libmfx"
2772vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"2749vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
2773vp9_d3d11va_hwaccel_select="vp9_decoder"2750vp9_d3d11va_hwaccel_select="vp9_decoder"
2774vp9_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_VP9"2751vp9_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
2775vp9_d3d11va2_hwaccel_select="vp9_decoder"2752vp9_d3d11va2_hwaccel_select="vp9_decoder"
2776vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"2753vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
2777vp9_dxva2_hwaccel_select="vp9_decoder"2754vp9_dxva2_hwaccel_select="vp9_decoder"
2778vp9_mediacodec_hwaccel_deps="mediacodec"
2779vp9_nvdec_hwaccel_deps="nvdec"2755vp9_nvdec_hwaccel_deps="nvdec"
2780vp9_nvdec_hwaccel_select="vp9_decoder"2756vp9_nvdec_hwaccel_select="vp9_decoder"
2781vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"2757vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"
@@ -2816,7 +2792,7 @@ h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser" · 34 unmodified lines
2816h264_mmal_decoder_deps="mmal"2792h264_mmal_decoder_deps="mmal"
2817h264_nvenc_encoder_deps="nvenc"2793h264_nvenc_encoder_deps="nvenc"
2818h264_omx_encoder_deps="omx"2794h264_omx_encoder_deps="omx"
2819h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"2795h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec"
2820h264_qsv_encoder_select="qsvenc"2796h264_qsv_encoder_select="qsvenc"
2821h264_rkmpp_decoder_deps="rkmpp"2797h264_rkmpp_decoder_deps="rkmpp"
2822h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"2798h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
@@ -2829,7 +2805,7 @@ hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf" · 6 unmodified lines
2829hevc_mediacodec_decoder_deps="mediacodec"2805hevc_mediacodec_decoder_deps="mediacodec"
2830hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"2806hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
2831hevc_nvenc_encoder_deps="nvenc"2807hevc_nvenc_encoder_deps="nvenc"
2832hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"2808hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec"
2833hevc_qsv_encoder_select="hevcparse qsvenc"2809hevc_qsv_encoder_select="hevcparse qsvenc"
2834hevc_rkmpp_decoder_deps="rkmpp"2810hevc_rkmpp_decoder_deps="rkmpp"
2835hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf"2811hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf"
@@ -2848,7 +2824,7 @@ mpeg2_crystalhd_decoder_select="crystalhd" · 12 unmodified lines
2848mpeg2_cuvid_decoder_deps="cuvid"2824mpeg2_cuvid_decoder_deps="cuvid"
2849mpeg2_mmal_decoder_deps="mmal"2825mpeg2_mmal_decoder_deps="mmal"
2850mpeg2_mediacodec_decoder_deps="mediacodec"2826mpeg2_mediacodec_decoder_deps="mediacodec"
2851mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"2827mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser"
2852mpeg2_qsv_encoder_select="qsvenc"2828mpeg2_qsv_encoder_select="qsvenc"
2853mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"2829mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
2854mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"2830mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"
@@ -2866,11 +2842,11 @@ nvenc_hevc_encoder_select="hevc_nvenc_encoder" · 11 unmodified lines
2866vc1_crystalhd_decoder_select="crystalhd"2842vc1_crystalhd_decoder_select="crystalhd"
2867vc1_cuvid_decoder_deps="cuvid"2843vc1_cuvid_decoder_deps="cuvid"
2868vc1_mmal_decoder_deps="mmal"2844vc1_mmal_decoder_deps="mmal"
2869vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"2845vc1_qsv_decoder_select="qsvdec vc1_parser"
2870vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"2846vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"
2871vp8_cuvid_decoder_deps="cuvid"2847vp8_cuvid_decoder_deps="cuvid"
2872vp8_mediacodec_decoder_deps="mediacodec"2848vp8_mediacodec_decoder_deps="mediacodec"
2873vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"2849vp8_qsv_decoder_select="qsvdec vp8_parser"
2874vp8_rkmpp_decoder_deps="rkmpp"2850vp8_rkmpp_decoder_deps="rkmpp"
2875vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"2851vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
2876vp8_vaapi_encoder_select="vaapi_encode"2852vp8_vaapi_encoder_select="vaapi_encode"
libavcodec/cuviddec.c+0−6
@@ -1115,12 +1115,6 @@ static const AVCodecHWConfigInternal *cuvid_hw_configs[] = { · 1114 unmodified lines
1115 .option = options, \1115 .option = options, \
1116 .version = LIBAVUTIL_VERSION_INT, \1116 .version = LIBAVUTIL_VERSION_INT, \
1117 }; \1117 }; \
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 }; \
1124 AVCodec ff_##x##_cuvid_decoder = { \1118 AVCodec ff_##x##_cuvid_decoder = { \
1125 .name = #x "_cuvid", \1119 .name = #x "_cuvid", \
1126 .long_name = NULL_IF_CONFIG_SMALL("Nvidia CUVID " #X " decoder"), \1120 .long_name = NULL_IF_CONFIG_SMALL("Nvidia CUVID " #X " decoder"), \
libavcodec/mediacodec.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 26
27#include "mediacodec.h"27#include "mediacodec.h"
28 28
29#if CONFIG_H264_MEDIACODEC_HWACCEL29#if CONFIG_MEDIACODEC
30 30
31#include <jni.h>31#include <jni.h>
32 32
libavcodec/mediacodecdec_common.c+0−42
@@ -757,45 +757,3 @@ int ff_mediacodec_dec_is_flushing(AVCodecContext *avctx, MediaCodecDecContext *s · 756 unmodified lines
757{757{
758 return s->flushing;758 return s->flushing;
759}759}
760
761AVHWAccel 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
768AVHWAccel 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
775AVHWAccel 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
782AVHWAccel 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
789AVHWAccel 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
796AVHWAccel 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
808 return ret;808 return ret;
809}809}
810 810
811AVHWAccel 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
818AVHWAccel 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
825AVHWAccel 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
832AVHWAccel 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
839static const AVCodecHWConfigInternal *mmal_hw_configs[] = {811static const AVCodecHWConfigInternal *mmal_hw_configs[] = {
840 HW_CONFIG_INTERNAL(MMAL),812 HW_CONFIG_INTERNAL(MMAL),
841 NULL813 NULL
libavcodec/qsvdec_h2645.c+0−18
@@ -180,15 +180,6 @@ static void qsv_decode_flush(AVCodecContext *avctx) · 179 unmodified lines
180#define OFFSET(x) offsetof(QSVH2645Context, x)180#define OFFSET(x) offsetof(QSVH2645Context, x)
181#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM181#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
182 182
183#if CONFIG_HEVC_QSV_HWACCEL
184AVHWAccel 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
192#if CONFIG_HEVC_QSV_DECODER183#if CONFIG_HEVC_QSV_DECODER
193static const AVOption hevc_options[] = {184static const AVOption hevc_options[] = {
194 { "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 },185 { "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
231};222};
232#endif223#endif
233 224
234#if CONFIG_H264_QSV_HWACCEL
235AVHWAccel 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
243#if CONFIG_H264_QSV_DECODER225#if CONFIG_H264_QSV_DECODER
244static const AVOption options[] = {226static const AVOption options[] = {
245 { "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 },227 { "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
158 { NULL },158 { NULL },
159};159};
160 160
161#if CONFIG_MPEG2_QSV_HWACCEL
162AVHWAccel 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
170#if CONFIG_MPEG2_QSV_DECODER161#if CONFIG_MPEG2_QSV_DECODER
171static const AVClass mpeg2_qsv_class = {162static const AVClass mpeg2_qsv_class = {
172 .class_name = "mpeg2_qsv",163 .class_name = "mpeg2_qsv",
@@ -194,15 +185,6 @@ AVCodec ff_mpeg2_qsv_decoder = { · 21 unmodified lines
194};185};
195#endif186#endif
196 187
197#if CONFIG_VC1_QSV_HWACCEL
198AVHWAccel 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
206#if CONFIG_VC1_QSV_DECODER188#if CONFIG_VC1_QSV_DECODER
207static const AVClass vc1_qsv_class = {189static const AVClass vc1_qsv_class = {
208 .class_name = "vc1_qsv",190 .class_name = "vc1_qsv",
@@ -230,15 +212,6 @@ AVCodec ff_vc1_qsv_decoder = { · 21 unmodified lines
230};212};
231#endif213#endif
232 214
233#if CONFIG_VP8_QSV_HWACCEL
234AVHWAccel 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
242#if CONFIG_VP8_QSV_DECODER215#if CONFIG_VP8_QSV_DECODER
243static const AVClass vp8_qsv_class = {216static const AVClass vp8_qsv_class = {
244 .class_name = "vp8_qsv",217 .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