nvenc.c (libav-12) | : | nvenc.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 116 | skipping to change at line 116 | |||
{ NV_ENC_ERR_INVALID_ENCODERDEVICE, AVERROR(EINVAL), "invalid encoder de vice" }, | { NV_ENC_ERR_INVALID_ENCODERDEVICE, AVERROR(EINVAL), "invalid encoder de vice" }, | |||
{ NV_ENC_ERR_INVALID_DEVICE, AVERROR(EINVAL), "invalid device" }, | { NV_ENC_ERR_INVALID_DEVICE, AVERROR(EINVAL), "invalid device" }, | |||
{ NV_ENC_ERR_DEVICE_NOT_EXIST, AVERROR(EIO), "device does not ex ist" }, | { NV_ENC_ERR_DEVICE_NOT_EXIST, AVERROR(EIO), "device does not ex ist" }, | |||
{ NV_ENC_ERR_INVALID_PTR, AVERROR(EFAULT), "invalid ptr" }, | { NV_ENC_ERR_INVALID_PTR, AVERROR(EFAULT), "invalid ptr" }, | |||
{ NV_ENC_ERR_INVALID_EVENT, AVERROR(EINVAL), "invalid event" }, | { NV_ENC_ERR_INVALID_EVENT, AVERROR(EINVAL), "invalid event" }, | |||
{ NV_ENC_ERR_INVALID_PARAM, AVERROR(EINVAL), "invalid param" }, | { NV_ENC_ERR_INVALID_PARAM, AVERROR(EINVAL), "invalid param" }, | |||
{ NV_ENC_ERR_INVALID_CALL, AVERROR(EINVAL), "invalid call" }, | { NV_ENC_ERR_INVALID_CALL, AVERROR(EINVAL), "invalid call" }, | |||
{ NV_ENC_ERR_OUT_OF_MEMORY, AVERROR(ENOMEM), "out of memory" }, | { NV_ENC_ERR_OUT_OF_MEMORY, AVERROR(ENOMEM), "out of memory" }, | |||
{ NV_ENC_ERR_ENCODER_NOT_INITIALIZED, AVERROR(EINVAL), "encoder not initia lized" }, | { NV_ENC_ERR_ENCODER_NOT_INITIALIZED, AVERROR(EINVAL), "encoder not initia lized" }, | |||
{ NV_ENC_ERR_UNSUPPORTED_PARAM, AVERROR(ENOSYS), "unsupported param" }, | { NV_ENC_ERR_UNSUPPORTED_PARAM, AVERROR(ENOSYS), "unsupported param" }, | |||
{ NV_ENC_ERR_LOCK_BUSY, AVERROR(EAGAIN), "lock busy" }, | { NV_ENC_ERR_LOCK_BUSY, AVERROR(EBUSY), "lock busy" }, | |||
{ NV_ENC_ERR_NOT_ENOUGH_BUFFER, AVERROR(ENOBUFS), "not enough buffer" }, | { NV_ENC_ERR_NOT_ENOUGH_BUFFER, AVERROR(ENOBUFS), "not enough buffer" }, | |||
{ NV_ENC_ERR_INVALID_VERSION, AVERROR(EINVAL), "invalid version" }, | { NV_ENC_ERR_INVALID_VERSION, AVERROR(EINVAL), "invalid version" }, | |||
{ NV_ENC_ERR_MAP_FAILED, AVERROR(EIO), "map failed" }, | { NV_ENC_ERR_MAP_FAILED, AVERROR(EIO), "map failed" }, | |||
{ NV_ENC_ERR_NEED_MORE_INPUT, AVERROR(EAGAIN), "need more input" | /* this is error should always be treated specially, so this "mapping" | |||
}, | * is for completeness only */ | |||
{ NV_ENC_ERR_ENCODER_BUSY, AVERROR(EAGAIN), "encoder busy" | { NV_ENC_ERR_NEED_MORE_INPUT, AVERROR_UNKNOWN, "need more input" | |||
}, | }, | |||
{ NV_ENC_ERR_ENCODER_BUSY, AVERROR(EBUSY), "encoder busy" | ||||
}, | ||||
{ NV_ENC_ERR_EVENT_NOT_REGISTERD, AVERROR(EBADF), "event not register ed" }, | { NV_ENC_ERR_EVENT_NOT_REGISTERD, AVERROR(EBADF), "event not register ed" }, | |||
{ NV_ENC_ERR_GENERIC, AVERROR_UNKNOWN, "generic error" }, | { NV_ENC_ERR_GENERIC, AVERROR_UNKNOWN, "generic error" }, | |||
{ NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY, AVERROR(EINVAL), "incompatible clien t key" }, | { NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY, AVERROR(EINVAL), "incompatible clien t key" }, | |||
{ NV_ENC_ERR_UNIMPLEMENTED, AVERROR(ENOSYS), "unimplemented" }, | { NV_ENC_ERR_UNIMPLEMENTED, AVERROR(ENOSYS), "unimplemented" }, | |||
{ NV_ENC_ERR_RESOURCE_REGISTER_FAILED, AVERROR(EIO), "resource register failed" }, | { NV_ENC_ERR_RESOURCE_REGISTER_FAILED, AVERROR(EIO), "resource register failed" }, | |||
{ NV_ENC_ERR_RESOURCE_NOT_REGISTERED, AVERROR(EBADF), "resource not regis tered" }, | { NV_ENC_ERR_RESOURCE_NOT_REGISTERED, AVERROR(EBADF), "resource not regis tered" }, | |||
{ NV_ENC_ERR_RESOURCE_NOT_MAPPED, AVERROR(EBADF), "resource not mappe d" }, | { NV_ENC_ERR_RESOURCE_NOT_MAPPED, AVERROR(EBADF), "resource not mappe d" }, | |||
}; | }; | |||
static int nvenc_map_error(NVENCSTATUS err, const char **desc) | static int nvenc_map_error(NVENCSTATUS err, const char **desc) | |||
End of changes. 2 change blocks. | ||||
5 lines changed or deleted | 7 lines changed or added |