Skip to content

obs-ffmpeg: Add ROI support for VAAPI #10136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nowrep wants to merge 1 commit into
base: master
Choose a base branch
from
Open

obs-ffmpeg: Add ROI support for VAAPI #10136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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
Expand All @@ -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 = {
Expand All @@ -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