| Message ID | 20200413153321.5956-1-sw@jkqxz.net |
|---|---|
| State | Accepted |
| Commit | 2594f6a362c788a036dbf3e27d540d15fe7f72d0 |
| Headers | show |
| Series | [FFmpeg-devel,1/8] lavc: Rename hwaccel.h to hwconfig.h | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
Apr 13, 2020, 16:33 by sw@jkqxz.net: > This already applied to decoders as well as hwaccels, and adding encoder > support was going to make the name even more inaccurate. > --- > libavcodec/cuviddec.c | 2 +- > libavcodec/decode.c | 2 +- > libavcodec/h263dec.c | 2 +- > libavcodec/h264dec.c | 2 +- > libavcodec/hevcdec.c | 2 +- > libavcodec/{hwaccel.h => hwconfig.h} | 6 +++--- > libavcodec/mediacodecdec.c | 2 +- > libavcodec/mjpegdec.c | 2 +- > libavcodec/mmaldec.c | 2 +- > libavcodec/mpeg12dec.c | 2 +- > libavcodec/mpeg4videodec.c | 2 +- > libavcodec/pthread_frame.c | 2 +- > libavcodec/qsvdec.h | 2 +- > libavcodec/rkmppdec.c | 2 +- > libavcodec/utils.c | 2 +- > libavcodec/vaapi_h264.c | 2 +- > libavcodec/vaapi_hevc.c | 2 +- > libavcodec/vaapi_mjpeg.c | 2 +- > libavcodec/vaapi_mpeg2.c | 2 +- > libavcodec/vaapi_mpeg4.c | 2 +- > libavcodec/vaapi_vc1.c | 2 +- > libavcodec/vaapi_vp8.c | 2 +- > libavcodec/vaapi_vp9.c | 2 +- > libavcodec/vc1dec.c | 2 +- > libavcodec/vdpau_h264.c | 2 +- > libavcodec/vdpau_hevc.c | 2 +- > libavcodec/vdpau_mpeg12.c | 2 +- > libavcodec/vdpau_mpeg4.c | 2 +- > libavcodec/vdpau_vc1.c | 2 +- > libavcodec/vdpau_vp9.c | 2 +- > libavcodec/vp8.c | 2 +- > libavcodec/vp9.c | 2 +- > 32 files changed, 34 insertions(+), 34 deletions(-) > rename libavcodec/{hwaccel.h => hwconfig.h} (97%) > patchset reviewed, LGTM I can't believe this hasn't been implemented yet. The only way to guess what the encoder needs currently is by tokenizing the name with an underscore and giving the last part to av_hwdevice_find_type_by_name, and av_get_pix_fmt, which is beyond ridiculous and fragile. I kind of need this, so could you push this soon? Its already been 10 days on the ML.
On 19/04/2020 15:21, Zhong Li wrote: > Mark Thompson <sw@jkqxz.net> 于2020年4月13日周一 下午11:34写道： >> >> All of these encoders can accept libmfx surfaces directly in a hardware >> frames context, or they can accept software frames if a suitable device >> is supplied to use. >> --- >> libavcodec/qsvenc.c | 7 +++++++ >> libavcodec/qsvenc.h | 3 +++ >> libavcodec/qsvenc_h264.c | 1 + >> libavcodec/qsvenc_hevc.c | 1 + >> libavcodec/qsvenc_jpeg.c | 1 + >> libavcodec/qsvenc_mpeg2.c | 1 + >> libavcodec/qsvenc_vp9.c | 1 + >> 7 files changed, 15 insertions(+) >> >>... > > LGTM > On 23/04/2020 10:22, Lynne wrote: > Apr 13, 2020, 16:33 by sw@jkqxz.net: > >> This already applied to decoders as well as hwaccels, and adding encoder >> support was going to make the name even more inaccurate. >> --- >> libavcodec/cuviddec.c | 2 +- >> libavcodec/decode.c | 2 +- >> libavcodec/h263dec.c | 2 +- >> libavcodec/h264dec.c | 2 +- >> libavcodec/hevcdec.c | 2 +- >> libavcodec/{hwaccel.h => hwconfig.h} | 6 +++--- >> libavcodec/mediacodecdec.c | 2 +- >> libavcodec/mjpegdec.c | 2 +- >> libavcodec/mmaldec.c | 2 +- >> libavcodec/mpeg12dec.c | 2 +- >> libavcodec/mpeg4videodec.c | 2 +- >> libavcodec/pthread_frame.c | 2 +- >> libavcodec/qsvdec.h | 2 +- >> libavcodec/rkmppdec.c | 2 +- >> libavcodec/utils.c | 2 +- >> libavcodec/vaapi_h264.c | 2 +- >> libavcodec/vaapi_hevc.c | 2 +- >> libavcodec/vaapi_mjpeg.c | 2 +- >> libavcodec/vaapi_mpeg2.c | 2 +- >> libavcodec/vaapi_mpeg4.c | 2 +- >> libavcodec/vaapi_vc1.c | 2 +- >> libavcodec/vaapi_vp8.c | 2 +- >> libavcodec/vaapi_vp9.c | 2 +- >> libavcodec/vc1dec.c | 2 +- >> libavcodec/vdpau_h264.c | 2 +- >> libavcodec/vdpau_hevc.c | 2 +- >> libavcodec/vdpau_mpeg12.c | 2 +- >> libavcodec/vdpau_mpeg4.c | 2 +- >> libavcodec/vdpau_vc1.c | 2 +- >> libavcodec/vdpau_vp9.c | 2 +- >> libavcodec/vp8.c | 2 +- >> libavcodec/vp9.c | 2 +- >> 32 files changed, 34 insertions(+), 34 deletions(-) >> rename libavcodec/{hwaccel.h => hwconfig.h} (97%) >> > > patchset reviewed, LGTM > I can't believe this hasn't been implemented yet. The only way to guess what the encoder needs > currently is by tokenizing the name with an underscore and giving the last part to av_hwdevice_find_type_by_name, and av_get_pix_fmt, which is beyond ridiculous and fragile. > > I kind of need this, so could you push this soon? Its already been 10 days on the ML. Applied, except the NVENC part which I can't test. Thanks, - Mark
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 50dc8956c3..9477b8fd3a 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -33,7 +33,7 @@ #include "avcodec.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "nvdec.h" #include "internal.h" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index b7ae1fbb84..2625790b57 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -41,7 +41,7 @@ #include "avcodec.h" #include "bytestream.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "thread.h" diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8ee844e298..31ac563f43 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -33,7 +33,7 @@ #include "flv.h" #include "h263.h" #include "h263_parser.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mpeg_er.h" #include "mpeg4video.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index e374f32e91..4c355feb18 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -46,7 +46,7 @@ #include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mathops.h" #include "me_cmp.h" #include "mpegutils.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 36be83948e..78299f4b32 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -41,7 +41,7 @@ #include "hevc_data.h" #include "hevc_parse.h" #include "hevcdec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "profiles.h" const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; diff --git a/libavcodec/hwaccel.h b/libavcodec/hwconfig.h similarity index 97% rename from libavcodec/hwaccel.h rename to libavcodec/hwconfig.h index 3aaa92571c..4199ffdd50 100644 --- a/libavcodec/hwaccel.h +++ b/libavcodec/hwconfig.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_HWACCEL_H -#define AVCODEC_HWACCEL_H +#ifndef AVCODEC_HWCONFIG_H +#define AVCODEC_HWCONFIG_H #include "avcodec.h" #include "hwaccels.h" @@ -81,4 +81,4 @@ typedef struct AVCodecHWConfigInternal { #define HWACCEL_XVMC(codec) \ HW_CONFIG_HWACCEL(0, 0, 1, XVMC, NONE, ff_ ## codec ## _xvmc_hwaccel) -#endif /* AVCODEC_HWACCEL_H */ +#endif /* AVCODEC_HWCONFIG_H */ diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index f5771bffb1..25410021e8 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -34,7 +34,7 @@ #include "decode.h" #include "h264_parse.h" #include "hevc_parse.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mediacodec_wrapper.h" #include "mediacodecdec_common.h" diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index d5e7c21610..cb5e2a9b9b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -36,7 +36,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "copy_block.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "idctdsp.h" #include "internal.h" #include "jpegtables.h" diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 647a22ef7c..547bece576 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -34,7 +34,7 @@ #include <stdatomic.h> #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "libavutil/avassert.h" #include "libavutil/buffer.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 67ce59d451..40d054def5 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -36,7 +36,7 @@ #include "avcodec.h" #include "bytestream.h" #include "error_resilience.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "idctdsp.h" #include "internal.h" #include "mpeg_er.h" diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index bfb1f92b33..7e52bbef1b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -26,7 +26,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "error_resilience.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "idctdsp.h" #include "internal.h" #include "mpegutils.h" diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 4cd890b295..64121f5a9a 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -28,7 +28,7 @@ #include <stdint.h> #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "pthread_internal.h" #include "thread.h" diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index dec1f61ceb..cb948f516d 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -33,7 +33,7 @@ #include "libavutil/pixfmt.h" #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "qsv_internal.h" typedef struct QSVContext { diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 143d05bd51..248020d5d6 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -28,7 +28,7 @@ #include "avcodec.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "libavutil/buffer.h" #include "libavutil/common.h" diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 26c038dfd9..e77090daef 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -44,7 +44,7 @@ #include "libavutil/thread.h" #include "avcodec.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "libavutil/opt.h" #include "mpegvideo.h" #include "thread.h" diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index dd2a657160..9332aa6f31 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -22,7 +22,7 @@ #include "h264dec.h" #include "h264_ps.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" /** diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index d832b8cb0d..c83d481b90 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -25,7 +25,7 @@ #include "avcodec.h" #include "hevcdec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "vaapi_hevc.h" #include "h265_profile_level.h" diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c index 14e0206ae1..81582114b6 100644 --- a/libavcodec/vaapi_mjpeg.c +++ b/libavcodec/vaapi_mjpeg.c @@ -19,7 +19,7 @@ #include <va/va.h> #include <va/va_dec_jpeg.h> -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "mjpegdec.h" diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index aaed434c88..26e0cd827c 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hwaccel.h" +#include "hwconfig.h" #include "mpegutils.h" #include "mpegvideo.h" #include "internal.h" diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 11860ff747..71e155154c 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -21,7 +21,7 @@ */ #include "h263.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mpeg4video.h" #include "mpegvideo.h" diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 921ca6391b..4e9607d9be 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "vaapi_decode.h" #include "vc1.h" diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c index 2426b30f13..06c23e760b 100644 --- a/libavcodec/vaapi_vp8.c +++ b/libavcodec/vaapi_vp8.c @@ -19,7 +19,7 @@ #include <va/va.h> #include <va/va_dec_vp8.h> -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "vp8.h" diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c index f384ba7873..776382f683 100644 --- a/libavcodec/vaapi_vp9.c +++ b/libavcodec/vaapi_vp9.c @@ -22,7 +22,7 @@ #include "libavutil/pixdesc.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "vp9shared.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 15783e3b8d..7809234ff7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -29,7 +29,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "get_bits.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mpeg_er.h" #include "mpegvideo.h" diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 2a260f76ab..5ba73dafd4 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -27,7 +27,7 @@ #include "internal.h" #include "h264dec.h" #include "h264_ps.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mpegutils.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index 024ac6e2f2..29cb2da078 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -26,7 +26,7 @@ #include "internal.h" #include "hevc_data.h" #include "hevcdec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index d286e7e57d..72220ffb4e 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -24,7 +24,7 @@ #include <vdpau/vdpau.h> #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mpegvideo.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 96f83026a8..93b25beb1f 100644 --- a/libavcodec/vdpau_mpeg4.c +++ b/libavcodec/vdpau_mpeg4.c @@ -24,7 +24,7 @@ #include <vdpau/vdpau.h> #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mpeg4video.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index 671baf96b4..96c91b58be 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -24,7 +24,7 @@ #include <vdpau/vdpau.h> #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vc1.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c index 54e060fad5..a8609d647e 100644 --- a/libavcodec/vdpau_vp9.c +++ b/libavcodec/vdpau_vp9.c @@ -26,7 +26,7 @@ #include "internal.h" #include "vp9data.h" #include "vp9dec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 1794d6d031..bab4223aca 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -27,7 +27,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mathops.h" #include "rectangle.h" diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 2a3a4555b9..bf6cc3aea5 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -23,7 +23,7 @@ #include "avcodec.h" #include "get_bits.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "profiles.h" #include "thread.h"
This already applied to decoders as well as hwaccels, and adding encoder support was going to make the name even more inaccurate. --- libavcodec/cuviddec.c | 2 +- libavcodec/decode.c | 2 +- libavcodec/h263dec.c | 2 +- libavcodec/h264dec.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/{hwaccel.h => hwconfig.h} | 6 +++--- libavcodec/mediacodecdec.c | 2 +- libavcodec/mjpegdec.c | 2 +- libavcodec/mmaldec.c | 2 +- libavcodec/mpeg12dec.c | 2 +- libavcodec/mpeg4videodec.c | 2 +- libavcodec/pthread_frame.c | 2 +- libavcodec/qsvdec.h | 2 +- libavcodec/rkmppdec.c | 2 +- libavcodec/utils.c | 2 +- libavcodec/vaapi_h264.c | 2 +- libavcodec/vaapi_hevc.c | 2 +- libavcodec/vaapi_mjpeg.c | 2 +- libavcodec/vaapi_mpeg2.c | 2 +- libavcodec/vaapi_mpeg4.c | 2 +- libavcodec/vaapi_vc1.c | 2 +- libavcodec/vaapi_vp8.c | 2 +- libavcodec/vaapi_vp9.c | 2 +- libavcodec/vc1dec.c | 2 +- libavcodec/vdpau_h264.c | 2 +- libavcodec/vdpau_hevc.c | 2 +- libavcodec/vdpau_mpeg12.c | 2 +- libavcodec/vdpau_mpeg4.c | 2 +- libavcodec/vdpau_vc1.c | 2 +- libavcodec/vdpau_vp9.c | 2 +- libavcodec/vp8.c | 2 +- libavcodec/vp9.c | 2 +- 32 files changed, 34 insertions(+), 34 deletions(-) rename libavcodec/{hwaccel.h => hwconfig.h} (97%)