diff options
author | James Almer <jamrial@gmail.com> | 2020-06-09 18:31:32 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2020-06-18 17:11:37 -0300 |
commit | 827d6fe73d2f5472c1c2128eb14fab6a4db29032 (patch) | |
tree | 7bc2bdec4590e7b4adb268e34007e42b857d2967 /libavcodec/nvenc.h | |
parent | 71f19bf5e31ec4039ef0f9e22b157657c57e2cb9 (diff) | |
download | ffmpeg-827d6fe73d2f5472c1c2128eb14fab6a4db29032.tar.gz |
avcodec/encode: restructure the core encoding code
This commit follows the same logic as 061a0c14bb, but for the encode API: The
new public encoding API will no longer be a wrapper around the old deprecated
one, and the internal API used by the encoders now consists of a single
receive_packet() callback that pulls frames as required.
amf encoders adapted by James Almer
librav1e encoder adapted by James Almer
nvidia encoders adapted by James Almer
MediaFoundation encoders adapted by James Almer
vaapi encoders adapted by Linjie Fu
v4l2_m2m encoders adapted by Andriy Gelman
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/nvenc.h')
-rw-r--r-- | libavcodec/nvenc.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 7a415a4835..007721aa66 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -138,6 +138,8 @@ typedef struct NvencContext CUstream cu_stream; ID3D11Device *d3d11_device; + AVFrame *frame; + int nb_surfaces; NvencSurface *surfaces; @@ -146,8 +148,6 @@ typedef struct NvencContext AVFifoBuffer *output_surface_ready_queue; AVFifoBuffer *timestamp_list; - int encoder_flushing; - struct { void *ptr; int ptr_index; @@ -203,13 +203,8 @@ int ff_nvenc_encode_init(AVCodecContext *avctx); int ff_nvenc_encode_close(AVCodecContext *avctx); -int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame); - int ff_nvenc_receive_packet(AVCodecContext *avctx, AVPacket *pkt); -int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *frame, int *got_packet); - void ff_nvenc_encode_flush(AVCodecContext *avctx); extern const enum AVPixelFormat ff_nvenc_pix_fmts[]; |