Merge commit '8a62d2c28fbacd1ae20c35887a1eecba2be14371'

* commit '8a62d2c28fbacd1ae20c35887a1eecba2be14371': vaapi_encode: Maintain a pool of bitstream output buffers

Hendrik Leppkes committed 10 years ago

Commit 724a71d2 parents c17563c 8a62d2c2 files · +75 −19Browse files

Showing the changes to libavcodec/vaapi_encode.h (1 of 2 files). Show all

Unified · Split

@@ -39,7 +39,6 @@ enum { · 38 unmodified lines
39	39	MAX_PARAM_BUFFERS = 16,
40	40	MAX_REORDER_DELAY = 16,
41	41	MAX_PARAM_BUFFER_SIZE = 1024,
42		− MAX_OUTPUT_BUFFER_SIZE = 1024 * 1024,
43	42	};
44	43
45	44	enum {
@@ -84,6 +83,7 @@ typedef struct VAAPIEncodePicture { · 38 unmodified lines
84	83	int nb_param_buffers;
85	84	VABufferID param_buffers[MAX_PARAM_BUFFERS];
86	85
	86	+ AVBufferRef *output_buffer_ref;
87	87	VABufferID output_buffer;
88	88
89	89	void *priv_data;
@@ -130,6 +130,8 @@ typedef struct VAAPIEncodeContext { · 40 unmodified lines
130	130	AVBufferRef *recon_frames_ref;
131	131	AVHWFramesContext *recon_frames;
132	132
	133	+ AVBufferPool *output_buffer_pool;
	134	+
133	135	VAConfigAttrib config_attributes[MAX_CONFIG_ATTRIBUTES];
134	136	int nb_config_attributes;
135	137

Keyboard shortcuts