Insert frame packing arrangement messages into the stream when input
frames have associated stereo 3D side-data.
---
This was requested recently on ffmpeg-user -
<http://ffmpeg.org/pipermail/ffmpeg-user/2019-September/045411.html>. Easy to
add, so here you go.
Output matches that produced by libx264 in the cases I could test.
libavcodec/vaapi_encode_h264.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index f4965d8b09..58eae613c4 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -25,6 +25,7 @@
#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
+#include "libavutil/stereo3d.h"
#include "avcodec.h"
#include "cbs.h"
@@ -39,6 +40,7 @@ enum {
SEI_TIMING = 0x01,
SEI_IDENTIFIER = 0x02,
SEI_RECOVERY_POINT = 0x04,
+ SEI_FRAME_PACKING = 0x20,
};
// Random (version 4) ISO 11578 UUID.
@@ -96,6 +98,7 @@ typedef struct VAAPIEncodeH264Context {
H264RawSEIBufferingPeriod sei_buffering_period;
H264RawSEIPicTiming sei_pic_timing;
H264RawSEIRecoveryPoint sei_recovery_point;
+ H264RawSEIFramePackingArrangement sei_frame_packing;
H264RawSEIUserDataUnregistered sei_identifier;
char *sei_identifier_string;
@@ -251,6 +254,12 @@ static int
vaapi_encode_h264_write_extra_header(AVCodecContext *avctx,
sei->payload[i].payload.recovery_point = priv->sei_recovery_point;
++i;
}
+ if (priv->sei_needed & SEI_FRAME_PACKING) {
+ sei->payload[i].payload_type = H264_SEI_TYPE_FRAME_PACKING;
+ sei->payload[i].payload.frame_packing_arrangement =
+ priv->sei_frame_packing;
+ ++i;
+ }
sei->payload_count = i;
av_assert0(sei->payload_count > 0);
@@ -700,6 +709,17 @@ static int
vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
priv->sei_needed |= SEI_RECOVERY_POINT;
}
+ if (priv->sei & SEI_FRAME_PACKING) {
+ AVFrameSideData *sd = av_frame_get_side_data(pic->input_image,
+ AV_FRAME_DATA_STEREO3D);
+ if (sd) {
+ ff_cbs_h264_fill_sei_frame_packing_arrangement(
+ &priv->sei_frame_packing, (const AVStereo3D*)sd->data);
+ }
+
+ priv->sei_needed |= SEI_FRAME_PACKING;
+ }
+
vpic->CurrPic = (VAPictureH264) {
.picture_id = pic->recon_surface,
.frame_idx = hpic->frame_num,
@@ -1271,7 +1291,7 @@ static const AVOption vaapi_encode_h264_options[] = {
{ "sei", "Set SEI to include",
OFFSET(sei), AV_OPT_TYPE_FLAGS,
- { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT },
+ { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT |
SEI_FRAME_PACKING },
0, INT_MAX, FLAGS, "sei" },
{ "identifier", "Include encoder version identifier",
0, AV_OPT_TYPE_CONST, { .i64 = SEI_IDENTIFIER },
@@ -1282,6 +1302,9 @@ static const AVOption vaapi_encode_h264_options[] = {
{ "recovery_point", "Include recovery points where appropriate",
0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT },
INT_MIN, INT_MAX, FLAGS, "sei" },
+ { "frame_packing", "Include frame packing arrangement for stereo 3D",
+ 0, AV_OPT_TYPE_CONST, { .i64 = SEI_FRAME_PACKING },
+ INT_MIN, INT_MAX, FLAGS, "sei" },
{ "profile", "Set profile (profile_idc and constraint_set*_flag)",
OFFSET(profile), AV_OPT_TYPE_INT,
--
2.20.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
