Quoting Mark Thompson (2017-10-26 01:18:39)
> ---
> Rebased on the frame parameter changes, and incorporating all review comments
> from last time.
>
>
> doc/APIchanges | 3 +++
> libavcodec/avcodec.h | 74
> ++++++++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/hwaccel.h | 18 +++++++++++++
> libavcodec/utils.c | 12 +++++++++
> 4 files changed, 107 insertions(+)
>
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 9f3a1f246..490c71cc2 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -13,6 +13,9 @@ libavutil: 2017-03-23
>
> API changes, most recent first:
>
> +2017-xx-xx - xxxxxxx - lavc 58.x+1.0 - avcodec.h
> + Add AVCodecHWConfig and avcodec_get_hw_config().
> +
> 2017-xx-xx - xxxxxxx - lavc 58.5.0 - avcodec.h
> Add avcodec_get_hw_frames_parameters().
>
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 562483502..b4bd4ad16 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -35,6 +35,7 @@
> #include "libavutil/cpu.h"
> #include "libavutil/dict.h"
> #include "libavutil/frame.h"
> +#include "libavutil/hwcontext.h"
> #include "libavutil/log.h"
> #include "libavutil/pixfmt.h"
> #include "libavutil/rational.h"
> @@ -2735,6 +2736,61 @@ typedef struct AVProfile {
> const char *name; ///< short name for the profile
> } AVProfile;
>
> +enum {
> + /**
> + * The codec supports this format via the hw_device_ctx interface.
> + *
> + * When selecting this format, AVCodecContext.hw_device_ctx should
> + * have been set to a device of the specified type before calling
> + * avcodec_open2().
> + */
> + AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX = 0x01,
> + /**
> + * The codec supports this format via the hw_frames_ctx interface.
> + *
> + * When selecting this format for a decoder,
> + * AVCodecContext.hw_frames_ctx should be set to a suitable frames
> + * context inside the get_format() callback. The frames context
> + * must have been created on a device of the specified type.
> + */
> + AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02,
> + /**
> + * The codec supports this format by some internal method.
> + *
> + * This format can be selected without any additional configuration -
> + * no device or frames are required.
> + */
> + AV_CODEC_HW_CONFIG_METHOD_INTERNAL = 0x04,
> + /**
> + * The codec supports this format by some ad-hoc method.
> + *
> + * Additional settings and/or function calls are required. See the
> + * codec-specific documentation for details. (Methods requiring
> + * this sort of configuration are deprecated and others should be
> + * used in preference.)
> + */
> + AV_CODEC_HW_CONFIG_METHOD_AD_HOC = 0x08,
> +};
> +
> +typedef struct AVCodecHWConfig {
> + /**
> + * A hardware pixel format which the codec can use.
> + */
> + enum AVPixelFormat pix_fmt;
> + /**
> + * Bit set of AV_CODEC_HW_CONFIG_METHOD_* flags, describing the possible
> + * setup methods which can be used with this configuration.
> + */
> + int methods;
> + /**
> + * The device type associated with the configuration.
> + *
> + * Must be set for AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX and
> + * AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, otherwise unused.
> + */
> + enum AVHWDeviceType device_type;
> +} AVCodecHWConfig;
> +
> typedef struct AVCodecDefault AVCodecDefault;
>
> struct AVSubtitle;
> @@ -2859,9 +2915,27 @@ typedef struct AVCodec {
> * packets before decoding.
> */
> const char *bsfs;
> +
> + /**
> + * Array of pointers to hardware configurations supported by the codec,
> + * or NULL if no hardware supported. The array is terminated by a NULL
> + * pointer.
> + *
> + * The user can only access this field via avcodec_get_hw_config().
> + */
> + const struct FFCodecHWConfig **hw_configs;
We only use ff_ for internal functions, public-visible struct names
(even the opaque ones) are AV-prefixed. I suggest
AVCodecHWConfigInternal
> } AVCodec;
>
> /**
> + * Retrieve supported hardware configurations for a codec.
> + *
> + * Values of index from zero to some maximum return the indexed configuration
> + * descriptor; all other values return NULL. If the codec does not support
> + * any hardware configurations then it will always return NULL.
> + */
> +const AVCodecHWConfig *avcodec_get_hw_config(const AVCodec *codec, int
> index);
> +
> +/**
> * @defgroup lavc_hwaccel AVHWAccel
> * @{
> */
> diff --git a/libavcodec/hwaccel.h b/libavcodec/hwaccel.h
> index 60dbe81c8..a066bc40f 100644
> --- a/libavcodec/hwaccel.h
> +++ b/libavcodec/hwaccel.h
> @@ -19,6 +19,24 @@
> #ifndef AVCODEC_HWACCEL_H
> #define AVCODEC_HWACCEL_H
>
> +#include "avcodec.h"
> +
> +
> #define HWACCEL_CAP_ASYNC_SAFE (1 << 0)
>
> +
> +typedef struct FFCodecHWConfig {
> + /**
> + * This is the structure which will be returned to the user by
> + * avcodec_get_hw_config().
> + */
> + AVCodecHWConfig public;
const?
> + /**
> + * If this configuration uses a hwaccel, a pointer to it.
> + * If not, NULL.
> + */
> + AVHWAccel *hwaccel;
const?
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
