The frame->key_frame currently doesn't set extra header into frames when
using amf encoders.
The frame->pict_type is not set to amf picture type, now we force it.
Signed-off-by: reito
---
libavcodec/amfenc.c | 52 +
1 file changed, 52 insertions(+)
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index 061859f85c..076fecb760 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -696,6 +696,58 @@ int ff_amf_receive_packet(AVCodecContext *avctx,
AVPacket *avpkt)
break;
}
+// Override Picture Type for Frame
+if (avctx->codec->id == AV_CODEC_ID_H264) {
+switch (frame->pict_type) {
+case AV_PICTURE_TYPE_I:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_I);
+break;
+case AV_PICTURE_TYPE_P:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_P);
+break;
+case AV_PICTURE_TYPE_B:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_B);
+break;
+case AV_PICTURE_TYPE_S:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP);
+break;
+default:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE);
+break;
+}
+// Keyframe overrides previous assignment.
+if (frame->key_frame) {
+av_log(ctx, AV_LOG_DEBUG, "IDR,AUD,PPS and SPS set -
h264\n");
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_INSERT_SPS, 1);
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_INSERT_PPS, 1);
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR);
+}
+} else if (avctx->codec->id == AV_CODEC_ID_HEVC) {
+switch (frame->pict_type) {
+case AV_PICTURE_TYPE_I:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE,
AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I);
+break;
+case AV_PICTURE_TYPE_P:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE,
AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P);
+break;
+case AV_PICTURE_TYPE_B:
+av_log(ctx, AV_LOG_WARNING, "Ignoring B-Frame,
unsupported by AMD AMF H.265 Encoder.");
+break;
+case AV_PICTURE_TYPE_S:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE,
AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP);
+break;
+default:
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE,
AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE);
+break;
+}
+// Keyframe overrides previous assignment.
+if (frame->key_frame) {
+av_log(ctx, AV_LOG_DEBUG, "IDR,PPS and SPS set - h265\n");
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_HEVC_INSERT_HEADER, 1);
+AMF_ASSIGN_PROPERTY_INT64(res, surface,
AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE,
AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR);
+}
+}
+
// submit surface
res = ctx->encoder->pVtbl->SubmitInput(ctx->encoder,
(AMFData*)surface);
if (res == AMF_INPUT_FULL) { // handle full queue
--
2.38.1.windows.1
--
这封电子邮件已由 Avast 防病毒软件检查过病毒。
www.avast.com
___
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
