if (ret < 0)
return ff_qsv_print_error(avctx, ret,
"Error initializing the encoder");
+ else if (ret > 0)
+ ff_qsv_print_warning(avctx, ret,
+ "Warning in encoder initialization");
ret = qsv_retrieve_enc_params(avctx, q);
if (ret < 0) {
{
QSVFrame *cur = q->work_frames;
while (cur) {
- if (cur->surface && !cur->surface->Data.Locked) {
- cur->surface = NULL;
+ if (cur->used && !cur->surface.Data.Locked) {
av_frame_unref(cur->frame);
+ cur->used = 0;
}
cur = cur->next;
}
frame = q->work_frames;
last = &q->work_frames;
while (frame) {
- if (!frame->surface) {
+ if (!frame->used) {
*f = frame;
+ frame->used = 1;
return 0;
}
*last = frame;
*f = frame;
+ frame->used = 1;
return 0;
}
if (ret < 0)
return ret;
- qf->surface = (mfxFrameSurface1*)qf->frame->data[3];
+ qf->surface = *(mfxFrameSurface1*)qf->frame->data[3];
+
+ if (q->frames_ctx.mids) {
+ ret = ff_qsv_find_surface_idx(&q->frames_ctx, qf);
+ if (ret < 0)
+ return ret;
+
+ qf->surface.Data.MemId = &q->frames_ctx.mids[ret];
+ }
} else {
/* make a copy if the input is not padded as libmfx requires */
if (frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) {
return ret;
}
- qf->surface_internal.Info = q->param.mfx.FrameInfo;
+ qf->surface.Info = q->param.mfx.FrameInfo;
- qf->surface_internal.Info.PicStruct =
+ qf->surface.Info.PicStruct =
!frame->interlaced_frame ? MFX_PICSTRUCT_PROGRESSIVE :
frame->top_field_first ? MFX_PICSTRUCT_FIELD_TFF :
MFX_PICSTRUCT_FIELD_BFF;
if (frame->repeat_pict == 1)
- qf->surface_internal.Info.PicStruct |= MFX_PICSTRUCT_FIELD_REPEATED;
+ qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FIELD_REPEATED;
else if (frame->repeat_pict == 2)
- qf->surface_internal.Info.PicStruct |= MFX_PICSTRUCT_FRAME_DOUBLING;
+ qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_DOUBLING;
else if (frame->repeat_pict == 4)
- qf->surface_internal.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING;
-
- qf->surface_internal.Data.PitchLow = qf->frame->linesize[0];
- qf->surface_internal.Data.Y = qf->frame->data[0];
- qf->surface_internal.Data.UV = qf->frame->data[1];
+ qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING;
- qf->surface = &qf->surface_internal;
+ qf->surface.Data.PitchLow = qf->frame->linesize[0];
+ qf->surface.Data.Y = qf->frame->data[0];
+ qf->surface.Data.UV = qf->frame->data[1];
}
- qf->surface->Data.TimeStamp = av_rescale_q(frame->pts, q->avctx->time_base, (AVRational){1, 90000});
+ qf->surface.Data.TimeStamp = av_rescale_q(frame->pts, q->avctx->time_base, (AVRational){1, 90000});
- *surface = qf->surface;
+ *surface = &qf->surface;
return 0;
}
av_usleep(1);
} while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);
+ if (ret > 0)
+ ff_qsv_print_warning(avctx, ret, "Warning during encoding");
+
if (ret < 0) {
av_packet_unref(&new_pkt);
av_freep(&bs);
q->internal_session = NULL;
av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
- av_freep(&q->frames_ctx.mids);
- q->frames_ctx.nb_mids = 0;
+ av_buffer_unref(&q->frames_ctx.mids_buf);
cur = q->work_frames;
while (cur) {