1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
From 326482451d49c8f0699d36448b862100fb2e0f9b Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Wed, 24 Jan 2024 12:51:57 +0100
Subject: [PATCH] obs-ffmpeg: Add ROI support for VAAPI
---
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c | 50 +++++++++++++++++++++++----
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
index 7777cdfe60bd0d..9018096b882e4d 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
@@ -627,12 +627,50 @@ static inline void copy_data(AVFrame *pic, const struct encoder_frame *frame, in
}
}
+static void roi_cb(void *param, struct obs_encoder_roi *roi)
+{
+ struct darray *da = param;
+ darray_push_back(sizeof(struct obs_encoder_roi), da, roi);
+}
+
+static void add_roi(struct vaapi_encoder *enc, AVFrame *frame)
+{
+ DARRAY(struct obs_encoder_roi) rois;
+ da_init(rois);
+ obs_encoder_enum_roi(enc->encoder, roi_cb, &rois);
+
+ AVRegionOfInterest *roi;
+ AVBufferRef *roi_ref = av_buffer_alloc(sizeof(*roi) * rois.num);
+ if (!roi_ref)
+ goto out;
+
+ roi = (AVRegionOfInterest *)roi_ref->data;
+ for (size_t i = 0; i < rois.num; ++i) {
+ roi[i] = (AVRegionOfInterest){
+ .self_size = sizeof(*roi),
+ .top = rois.array[i].top,
+ .bottom = rois.array[i].bottom,
+ .left = rois.array[i].left,
+ .right = rois.array[i].right,
+ .qoffset = av_d2q(-1.0 * rois.array[i].priority, 1000),
+ };
+ }
+ if (!av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST, roi_ref))
+ av_buffer_unref(&roi_ref);
+
+out:
+ da_free(rois);
+}
+
static bool vaapi_encode_internal(struct vaapi_encoder *enc, AVFrame *frame, struct encoder_packet *packet,
bool *received_packet)
{
int got_packet;
int ret;
+ if (obs_encoder_has_roi(enc->encoder))
+ add_roi(enc, frame);
+
ret = avcodec_send_frame(enc->context, frame);
if (ret == 0 || ret == AVERROR(EAGAIN))
ret = avcodec_receive_packet(enc->context, enc->packet);
@@ -1212,7 +1250,7 @@ struct obs_encoder_info h264_vaapi_encoder_info = {
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
- .caps = OBS_ENCODER_CAP_INTERNAL,
+ .caps = OBS_ENCODER_CAP_INTERNAL | OBS_ENCODER_CAP_ROI,
};
struct obs_encoder_info h264_vaapi_encoder_tex_info = {
@@ -1228,7 +1266,7 @@ struct obs_encoder_info h264_vaapi_encoder_tex_info = {
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
- .caps = OBS_ENCODER_CAP_PASS_TEXTURE,
+ .caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_ROI,
};
struct obs_encoder_info av1_vaapi_encoder_info = {
@@ -1244,7 +1282,7 @@ struct obs_encoder_info av1_vaapi_encoder_info = {
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
- .caps = OBS_ENCODER_CAP_INTERNAL,
+ .caps = OBS_ENCODER_CAP_INTERNAL | OBS_ENCODER_CAP_ROI,
};
struct obs_encoder_info av1_vaapi_encoder_tex_info = {
@@ -1260,7 +1298,7 @@ struct obs_encoder_info av1_vaapi_encoder_tex_info = {
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
- .caps = OBS_ENCODER_CAP_PASS_TEXTURE,
+ .caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_ROI,
};
#ifdef ENABLE_HEVC
@@ -1277,7 +1315,7 @@ struct obs_encoder_info hevc_vaapi_encoder_info = {
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
- .caps = OBS_ENCODER_CAP_INTERNAL,
+ .caps = OBS_ENCODER_CAP_INTERNAL | OBS_ENCODER_CAP_ROI,
};
struct obs_encoder_info hevc_vaapi_encoder_tex_info = {
@@ -1293,6 +1331,6 @@ struct obs_encoder_info hevc_vaapi_encoder_tex_info = {
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
- .caps = OBS_ENCODER_CAP_PASS_TEXTURE,
+ .caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_ROI,
};
#endif
|