virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

vaapi_encode_mpeg2: Move common structure into context

Browse Source
This commit is contained in:
Mark Thompson
2018-08-23 00:44:37 +01:00
parent 2c3ad16d3e
commit 537d6aa30e
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libavcodec/vaapi_encode_mpeg2.c
View File

@@ -28,6 +28,9 @@
#include "vaapi_encode.h" #include "vaapi_encode.h"
typedef struct VAAPIEncodeMPEG2Context { typedef struct VAAPIEncodeMPEG2Context {
VAAPIEncodeContext common;
// Derived settings.
int mb_width; int mb_width;
int mb_height; int mb_height;
@@ -35,15 +38,6 @@ typedef struct VAAPIEncodeMPEG2Context {
int quant_p; int quant_p;
int quant_b; int quant_b;
MPEG2RawSequenceHeader sequence_header;
MPEG2RawExtensionData sequence_extension;
MPEG2RawExtensionData sequence_display_extension;
MPEG2RawGroupOfPicturesHeader gop_header;
MPEG2RawPictureHeader picture_header;
MPEG2RawExtensionData picture_coding_extension;
int64_t last_i_frame;
unsigned int bit_rate; unsigned int bit_rate;
unsigned int vbv_buffer_size; unsigned int vbv_buffer_size;
@@ -52,6 +46,17 @@ typedef struct VAAPIEncodeMPEG2Context {
unsigned int f_code_horizontal; unsigned int f_code_horizontal;
unsigned int f_code_vertical; unsigned int f_code_vertical;
// Stream state.
int64_t last_i_frame;
// Writer structures.
MPEG2RawSequenceHeader sequence_header;
MPEG2RawExtensionData sequence_extension;
MPEG2RawExtensionData sequence_display_extension;
MPEG2RawGroupOfPicturesHeader gop_header;
MPEG2RawPictureHeader picture_header;
MPEG2RawExtensionData picture_coding_extension;
CodedBitstreamContext *cbc; CodedBitstreamContext *cbc;
CodedBitstreamFragment current_fragment; CodedBitstreamFragment current_fragment;
} VAAPIEncodeMPEG2Context; } VAAPIEncodeMPEG2Context;
@@ -61,8 +66,7 @@ static int vaapi_encode_mpeg2_write_fragment(AVCodecContext *avctx,
char *data, size_t *data_len, char *data, size_t *data_len,
CodedBitstreamFragment *frag) CodedBitstreamFragment *frag)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
int err; int err;
err = ff_cbs_write_fragment_data(priv->cbc, frag); err = ff_cbs_write_fragment_data(priv->cbc, frag);
@@ -88,8 +92,7 @@ static int vaapi_encode_mpeg2_add_header(AVCodecContext *avctx,
CodedBitstreamFragment *frag, CodedBitstreamFragment *frag,
int type, void *header) int type, void *header)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
int err; int err;
err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header, NULL); err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header, NULL);
@@ -105,8 +108,7 @@ static int vaapi_encode_mpeg2_add_header(AVCodecContext *avctx,
static int vaapi_encode_mpeg2_write_sequence_header(AVCodecContext *avctx, static int vaapi_encode_mpeg2_write_sequence_header(AVCodecContext *avctx,
char *data, size_t *data_len) char *data, size_t *data_len)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
CodedBitstreamFragment *frag = &priv->current_fragment; CodedBitstreamFragment *frag = &priv->current_fragment;
int err; int err;
@@ -140,8 +142,7 @@ static int vaapi_encode_mpeg2_write_picture_header(AVCodecContext *avctx,
VAAPIEncodePicture *pic, VAAPIEncodePicture *pic,
char *data, size_t *data_len) char *data, size_t *data_len)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
CodedBitstreamFragment *frag = &priv->current_fragment; CodedBitstreamFragment *frag = &priv->current_fragment;
int err; int err;
@@ -164,7 +165,7 @@ fail:
static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx) static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeContext *ctx = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
MPEG2RawSequenceHeader *sh = &priv->sequence_header; MPEG2RawSequenceHeader *sh = &priv->sequence_header;
MPEG2RawSequenceExtension *se = &priv->sequence_extension.data.sequence; MPEG2RawSequenceExtension *se = &priv->sequence_extension.data.sequence;
MPEG2RawSequenceDisplayExtension *sde = &priv->sequence_display_extension.data.sequence_display; MPEG2RawSequenceDisplayExtension *sde = &priv->sequence_display_extension.data.sequence_display;
@@ -416,8 +417,7 @@ static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx)
static int vaapi_encode_mpeg2_init_picture_params(AVCodecContext *avctx, static int vaapi_encode_mpeg2_init_picture_params(AVCodecContext *avctx,
VAAPIEncodePicture *pic) VAAPIEncodePicture *pic)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
MPEG2RawPictureHeader *ph = &priv->picture_header; MPEG2RawPictureHeader *ph = &priv->picture_header;
MPEG2RawPictureCodingExtension *pce = &priv->picture_coding_extension.data.picture_coding; MPEG2RawPictureCodingExtension *pce = &priv->picture_coding_extension.data.picture_coding;
VAEncPictureParameterBufferMPEG2 *vpic = pic->codec_picture_params; VAEncPictureParameterBufferMPEG2 *vpic = pic->codec_picture_params;
@@ -482,9 +482,8 @@ static int vaapi_encode_mpeg2_init_slice_params(AVCodecContext *avctx,
VAAPIEncodePicture *pic, VAAPIEncodePicture *pic,
VAAPIEncodeSlice *slice) VAAPIEncodeSlice *slice)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAEncSliceParameterBufferMPEG2 *vslice = slice->codec_slice_params; VAEncSliceParameterBufferMPEG2 *vslice = slice->codec_slice_params;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
int qp; int qp;
vslice->macroblock_address = priv->mb_width * slice->index; vslice->macroblock_address = priv->mb_width * slice->index;
@@ -515,7 +514,7 @@ static int vaapi_encode_mpeg2_init_slice_params(AVCodecContext *avctx,
static av_cold int vaapi_encode_mpeg2_configure(AVCodecContext *avctx) static av_cold int vaapi_encode_mpeg2_configure(AVCodecContext *avctx)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeContext *ctx = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
int err; int err;
err = ff_cbs_init(&priv->cbc, AV_CODEC_ID_MPEG2VIDEO, avctx); err = ff_cbs_init(&priv->cbc, AV_CODEC_ID_MPEG2VIDEO, avctx);
@@ -638,11 +637,9 @@ static av_cold int vaapi_encode_mpeg2_init(AVCodecContext *avctx)
static av_cold int vaapi_encode_mpeg2_close(AVCodecContext *avctx) static av_cold int vaapi_encode_mpeg2_close(AVCodecContext *avctx)
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
if (priv) ff_cbs_close(&priv->cbc);
ff_cbs_close(&priv->cbc);
return ff_vaapi_encode_close(avctx); return ff_vaapi_encode_close(avctx);
} }
@@ -665,7 +662,7 @@ AVCodec ff_mpeg2_vaapi_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 (VAAPI)"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 (VAAPI)"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,
.priv_data_size = sizeof(VAAPIEncodeContext), .priv_data_size = sizeof(VAAPIEncodeMPEG2Context),
.init = &vaapi_encode_mpeg2_init, .init = &vaapi_encode_mpeg2_init,
.encode2 = &ff_vaapi_encode2, .encode2 = &ff_vaapi_encode2,
.close = &vaapi_encode_mpeg2_close, .close = &vaapi_encode_mpeg2_close,