Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'

* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
  lavc: VAAPI encode common infrastructure

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-08 22:40:42 +01:00
commit 508957fd0f
4 changed files with 1316 additions and 0 deletions

2
configure vendored
View File

@ -2075,6 +2075,7 @@ CONFIG_EXTRA="
texturedsp
texturedspenc
tpeldsp
vaapi_encode
vc1dsp
videodsp
vp3dsp
@ -2275,6 +2276,7 @@ mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp"
mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
qsvdec_select="qsv"
qsvenc_select="qsv"
vaapi_encode_deps="vaapi"
vc1dsp_select="h264chroma qpeldsp startcode"
rdft_select="fft"

View File

@ -125,6 +125,7 @@ OBJS-$(CONFIG_STARTCODE) += startcode.o
OBJS-$(CONFIG_TEXTUREDSP) += texturedsp.o
OBJS-$(CONFIG_TEXTUREDSPENC) += texturedspenc.o
OBJS-$(CONFIG_TPELDSP) += tpeldsp.o
OBJS-$(CONFIG_VAAPI_ENCODE) += vaapi_encode.o
OBJS-$(CONFIG_VC1DSP) += vc1dsp.o
OBJS-$(CONFIG_VIDEODSP) += videodsp.o
OBJS-$(CONFIG_VP3DSP) += vp3dsp.o

1096
libavcodec/vaapi_encode.c Normal file

File diff suppressed because it is too large Load Diff

217
libavcodec/vaapi_encode.h Normal file
View File

@ -0,0 +1,217 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VAAPI_ENCODE_H
#define AVCODEC_VAAPI_ENCODE_H
#include <stdint.h>
#include <va/va.h>
#include "libavutil/hwcontext.h"
#include "libavutil/hwcontext_vaapi.h"
#include "avcodec.h"
struct VAAPIEncodeType;
struct VAAPIEncodePicture;
enum {
MAX_PICTURE_REFERENCES = 2,
MAX_PICTURE_SLICES = 1,
MAX_PARAM_BUFFERS = 16,
MAX_REORDER_DELAY = 16,
MAX_PARAM_BUFFER_SIZE = 1024,
MAX_OUTPUT_BUFFER_SIZE = 1024 * 1024,
};
enum {
PICTURE_TYPE_IDR = 0,
PICTURE_TYPE_I = 1,
PICTURE_TYPE_P = 2,
PICTURE_TYPE_B = 3,
};
enum {
// All encode operations are done independently.
ISSUE_MODE_SERIALISE_EVERYTHING = 0,
// Overlap as many operations as possible.
ISSUE_MODE_MAXIMISE_THROUGHPUT,
// Overlap operations only when satisfying parallel dependencies.
ISSUE_MODE_MINIMISE_LATENCY,
};
typedef struct VAAPIEncodeSlice {
void *priv_data;
void *codec_slice_params;
} VAAPIEncodeSlice;
typedef struct VAAPIEncodePicture {
struct VAAPIEncodePicture *next;
int64_t display_order;
int64_t encode_order;
int64_t pts;
int type;
int input_available;
int encode_issued;
int encode_complete;
AVFrame *input_image;
VASurfaceID input_surface;
AVFrame *recon_image;
VASurfaceID recon_surface;
int nb_param_buffers;
VABufferID param_buffers[MAX_PARAM_BUFFERS];
VABufferID output_buffer;
void *priv_data;
void *codec_picture_params;
int nb_refs;
struct VAAPIEncodePicture *refs[MAX_PICTURE_REFERENCES];
int nb_slices;
VAAPIEncodeSlice *slices[MAX_PICTURE_SLICES];
} VAAPIEncodePicture;
typedef struct VAAPIEncodeContext {
const AVClass *class;
// Codec-specific hooks.
const struct VAAPIEncodeType *codec;
// Codec-specific state.
void *priv_data;
VAProfile va_profile;
VAEntrypoint va_entrypoint;
VAConfigID va_config;
VAContextID va_context;
int va_rc_mode;
AVBufferRef *device_ref;
AVHWDeviceContext *device;
AVVAAPIDeviceContext *hwctx;
AVBufferRef *input_frames_ref;
AVHWFramesContext *input_frames;
// Input size, set from input frames.
int input_width;
int input_height;
// Aligned size, set by codec init, becomes hwframe size.
int aligned_width;
int aligned_height;
int nb_recon_frames;
AVBufferRef *recon_frames_ref;
AVHWFramesContext *recon_frames;
VAConfigAttrib *config_attributes;
int nb_config_attributes;
// Per-sequence parameter structure (VAEncSequenceParameterBuffer*).
void *codec_sequence_params;
// Per-sequence parameters found in the per-picture parameter
// structure (VAEncPictureParameterBuffer*).
void *codec_picture_params;
// Current encoding window, in display (input) order.
VAAPIEncodePicture *pic_start, *pic_end;
// Next input order index (display order).
int64_t input_order;
// Number of frames that output is behind input.
int64_t output_delay;
// Number of frames decode output will need to be delayed.
int64_t decode_delay;
// Next output order index (encode order).
int64_t output_order;
int issue_mode;
// Timestamp handling.
int64_t first_pts;
int64_t dts_pts_diff;
int64_t ts_ring[MAX_REORDER_DELAY * 3];
// Frame type decision.
int i_per_idr;
int p_per_i;
int b_per_p;
int idr_counter;
int i_counter;
int p_counter;
int end_of_stream;
} VAAPIEncodeContext;
typedef struct VAAPIEncodeType {
size_t priv_data_size;
int (*init)(AVCodecContext *avctx);
int (*close)(AVCodecContext *avctx);
size_t sequence_params_size;
size_t picture_params_size;
size_t slice_params_size;
int (*init_sequence_params)(AVCodecContext *avctx);
int (*init_picture_params)(AVCodecContext *avctx,
VAAPIEncodePicture *pic);
int (*init_slice_params)(AVCodecContext *avctx,
VAAPIEncodePicture *pic,
VAAPIEncodeSlice *slice);
int sequence_header_type;
int picture_header_type;
int slice_header_type;
int (*write_sequence_header)(AVCodecContext *avctx,
char *data, size_t *data_len);
int (*write_picture_header)(AVCodecContext *avctx,
VAAPIEncodePicture *pic,
char *data, size_t *data_len);
int (*write_slice_header)(AVCodecContext *avctx,
VAAPIEncodePicture *pic,
VAAPIEncodeSlice *slice,
char *data, size_t *data_len);
int (*write_extra_buffer)(AVCodecContext *avctx,
VAAPIEncodePicture *pic,
int index, int *type,
char *data, size_t *data_len);
} VAAPIEncodeType;
int ff_vaapi_encode2(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *input_image, int *got_packet);
int ff_vaapi_encode_init(AVCodecContext *avctx,
const VAAPIEncodeType *type);
int ff_vaapi_encode_close(AVCodecContext *avctx);
#endif /* AVCODEC_VAAPI_ENCODE_H */