OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-01 00:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OBS:3bb573a91168830da34ad126a3e35e0553965a39
Branches Tags
OBS:master
OBS:automated/clean-services
OBS:macos-metal-renderer
OBS:allow-high-precision-images
OBS:release/30.1
OBS:release/30.0
OBS:release/29.1
OBS:release/29.0
OBS:release/28.1
OBS:release/28.0
OBS:release/27.2
OBS:hash-table
OBS:25.0.8-patch
OBS:24.0.4-patch
OBS:metal
OBS:30.2.0-rc1
OBS:30.2.0-beta4
OBS:30.2.0-beta3
OBS:30.2.0-beta2
OBS:30.2.0-beta1
OBS:30.1.2
OBS:30.1.1
OBS:30.1.0
OBS:30.1.0-rc1
OBS:30.1.0-beta3
OBS:30.1.0-beta2
OBS:30.1.0-beta1
OBS:30.0.2
OBS:30.0.1
OBS:30.0.0
OBS:30.0.0-rc2
OBS:30.0.0-rc1
OBS:30.0.0-beta3
OBS:30.0.0-beta2
OBS:30.0.0-beta1
OBS:29.1.3
OBS:29.1.2
OBS:29.1.1
OBS:29.1.0
OBS:29.1.0-rc1
OBS:29.1.0-beta4
OBS:29.1.0-beta3
OBS:29.1.0-beta2
OBS:29.1.0-beta1
OBS:29.0.2
OBS:29.0.1
OBS:29.0.0
OBS:29.0.0-beta3
OBS:29.0.0-beta2
OBS:29.0.0-beta1
OBS:28.1.2
OBS:28.1.1
OBS:28.1.0
OBS:28.1.0-rc1
OBS:28.1.0-beta1
OBS:28.0.3
OBS:28.0.2
OBS:28.0.1
OBS:28.0.0
OBS:28.0.0-rc2
OBS:28.0.0-rc1
OBS:28.0.0-beta2
OBS:28.0.0-beta1
OBS:27.2.4
OBS:27.2.3
OBS:27.2.2
OBS:27.2.1
OBS:27.2.0
OBS:27.2.0-rc4
OBS:27.2.0-rc3
OBS:27.2.0-rc2
OBS:27.2.0-rc1
OBS:27.2.0-beta4
OBS:27.2.0-beta3
OBS:27.2.0-beta2
OBS:27.2.0-beta1
OBS:27.1.3
OBS:27.1.2
OBS:27.1.1
OBS:27.1.0
OBS:27.1.0-rc3
OBS:27.1.0-rc2
OBS:27.1.0-rc1
OBS:27.0.1
OBS:27.0.0
OBS:27.0.0-rc6
OBS:27.0.0-rc5
OBS:27.0.0-rc4
OBS:27.0.0-rc3
OBS:27.0.0-rc2
OBS:27.0.0-rc1
OBS:26.1.2
OBS:26.1.1
OBS:26.1.0
OBS:26.1.0-rc2
OBS:26.1.0-rc1
OBS:26.0.2
OBS:26.0.1
OBS:26.0.0
OBS:26.0.0-rc3
OBS:26.0.0-rc2
OBS:26.0.0-rc1
OBS:25.0.8
OBS:25.0.7
OBS:25.0.6
OBS:25.0.5
OBS:25.0.4
OBS:25.0.3
OBS:25.0.2
OBS:25.0.1
OBS:25.0.0
OBS:25.0.0-rc6
OBS:25.0.0-rc5
OBS:25.0.0-rc4
OBS:25.0.0-rc3
OBS:25.0.0-rc2
OBS:25.0.0-rc1
OBS:24.0.6
OBS:24.0.5
OBS:24.0.4
OBS:24.0.3
OBS:24.0.2
OBS:24.0.1
OBS:24.0.0
OBS:24.0.0-rc5
OBS:24.0.0-rc4
OBS:24.0.0-rc3
OBS:24.0.0-rc2
OBS:24.0.0-rc1
OBS:23.2.1
OBS:23.2.0
OBS:23.2.0-rc1
OBS:23.1.0
OBS:23.1.0-rc1
OBS:23.0.2
OBS:23.0.1
OBS:23.0.0
OBS:23.0.0-rc2
OBS:23.0.0-rc1
OBS:22.0.3
OBS:22.0.2
OBS:22.0.1
OBS:22.0.0
OBS:22.0.0-rc2
OBS:22.0.0-rc1
OBS:21.1.2
OBS:21.1.1
OBS:21.1.0
OBS:21.0.3
OBS:21.0.2
OBS:21.0.1
OBS:21.0.0
OBS:20.1.3
OBS:20.1.2
OBS:20.1.1
OBS:20.1.0
OBS:20.0.1
OBS:20.0.0
OBS:19.0.3
OBS:19.0.2
OBS:19.0.1
OBS:19.0.0
OBS:18.0.2
OBS:18.0.1
OBS:18.0.0
OBS:17.0.2
OBS:17.0.1
OBS:17.0.0
OBS:0.16.6
OBS:0.16.5
OBS:0.16.4
OBS:0.16.3
OBS:0.16.2
OBS:0.16.1
OBS:0.16.0
OBS:0.15.4
OBS:0.15.3
OBS:0.15.2
OBS:0.15.1
OBS:0.15.0
OBS:0.14.2
OBS:0.14.1
OBS:0.14.0
OBS:0.13.4
OBS:0.13.3
OBS:0.13.2
OBS:0.13.1
OBS:0.13.1-rc1
OBS:0.13.0
OBS:0.12.4
OBS:0.12.3
OBS:0.12.2
OBS:0.12.1
OBS:0.12.0
OBS:0.11.4
OBS:0.11.3
OBS:0.11.2
OBS:0.11.1
OBS:0.11.0
OBS:0.10.1
OBS:0.10.0
OBS:0.9.1
OBS:0.9.0
OBS:0.8.3
OBS:0.8.2
OBS:0.8.1
OBS:0.8.0
OBS:0.7.3
OBS:0.7.2
OBS:0.7.1
OBS:0.6.4
OBS:0.6.3
OBS:0.6.2
OBS:0.6.1
OBS:0.6.0
OBS:0.5.1
OBS:0.5.0
OBS:0.4.2
OBS:0.4.1
OBS:0.4.0
OBS:0.3.1
OBS:0.2.4
...
compare: OBS:bef2d515377e467a323a5391f7004c34a72090ed
Branches Tags
OBS:automated/clean-services
OBS:master
OBS:macos-metal-renderer
OBS:allow-high-precision-images
OBS:release/30.1
OBS:release/30.0
OBS:release/29.1
OBS:release/29.0
OBS:release/28.1
OBS:release/28.0
OBS:release/27.2
OBS:hash-table
OBS:25.0.8-patch
OBS:24.0.4-patch
OBS:metal
OBS:30.2.0-rc1
OBS:30.2.0-beta4
OBS:30.2.0-beta3
OBS:30.2.0-beta2
OBS:30.2.0-beta1
OBS:30.1.2
OBS:30.1.1
OBS:30.1.0
OBS:30.1.0-rc1
OBS:30.1.0-beta3
OBS:30.1.0-beta2
OBS:30.1.0-beta1
OBS:30.0.2
OBS:30.0.1
OBS:30.0.0
OBS:30.0.0-rc2
OBS:30.0.0-rc1
OBS:30.0.0-beta3
OBS:30.0.0-beta2
OBS:30.0.0-beta1
OBS:29.1.3
OBS:29.1.2
OBS:29.1.1
OBS:29.1.0
OBS:29.1.0-rc1
OBS:29.1.0-beta4
OBS:29.1.0-beta3
OBS:29.1.0-beta2
OBS:29.1.0-beta1
OBS:29.0.2
OBS:29.0.1
OBS:29.0.0
OBS:29.0.0-beta3
OBS:29.0.0-beta2
OBS:29.0.0-beta1
OBS:28.1.2
OBS:28.1.1
OBS:28.1.0
OBS:28.1.0-rc1
OBS:28.1.0-beta1
OBS:28.0.3
OBS:28.0.2
OBS:28.0.1
OBS:28.0.0
OBS:28.0.0-rc2
OBS:28.0.0-rc1
OBS:28.0.0-beta2
OBS:28.0.0-beta1
OBS:27.2.4
OBS:27.2.3
OBS:27.2.2
OBS:27.2.1
OBS:27.2.0
OBS:27.2.0-rc4
OBS:27.2.0-rc3
OBS:27.2.0-rc2
OBS:27.2.0-rc1
OBS:27.2.0-beta4
OBS:27.2.0-beta3
OBS:27.2.0-beta2
OBS:27.2.0-beta1
OBS:27.1.3
OBS:27.1.2
OBS:27.1.1
OBS:27.1.0
OBS:27.1.0-rc3
OBS:27.1.0-rc2
OBS:27.1.0-rc1
OBS:27.0.1
OBS:27.0.0
OBS:27.0.0-rc6
OBS:27.0.0-rc5
OBS:27.0.0-rc4
OBS:27.0.0-rc3
OBS:27.0.0-rc2
OBS:27.0.0-rc1
OBS:26.1.2
OBS:26.1.1
OBS:26.1.0
OBS:26.1.0-rc2
OBS:26.1.0-rc1
OBS:26.0.2
OBS:26.0.1
OBS:26.0.0
OBS:26.0.0-rc3
OBS:26.0.0-rc2
OBS:26.0.0-rc1
OBS:25.0.8
OBS:25.0.7
OBS:25.0.6
OBS:25.0.5
OBS:25.0.4
OBS:25.0.3
OBS:25.0.2
OBS:25.0.1
OBS:25.0.0
OBS:25.0.0-rc6
OBS:25.0.0-rc5
OBS:25.0.0-rc4
OBS:25.0.0-rc3
OBS:25.0.0-rc2
OBS:25.0.0-rc1
OBS:24.0.6
OBS:24.0.5
OBS:24.0.4
OBS:24.0.3
OBS:24.0.2
OBS:24.0.1
OBS:24.0.0
OBS:24.0.0-rc5
OBS:24.0.0-rc4
OBS:24.0.0-rc3
OBS:24.0.0-rc2
OBS:24.0.0-rc1
OBS:23.2.1
OBS:23.2.0
OBS:23.2.0-rc1
OBS:23.1.0
OBS:23.1.0-rc1
OBS:23.0.2
OBS:23.0.1
OBS:23.0.0
OBS:23.0.0-rc2
OBS:23.0.0-rc1
OBS:22.0.3
OBS:22.0.2
OBS:22.0.1
OBS:22.0.0
OBS:22.0.0-rc2
OBS:22.0.0-rc1
OBS:21.1.2
OBS:21.1.1
OBS:21.1.0
OBS:21.0.3
OBS:21.0.2
OBS:21.0.1
OBS:21.0.0
OBS:20.1.3
OBS:20.1.2
OBS:20.1.1
OBS:20.1.0
OBS:20.0.1
OBS:20.0.0
OBS:19.0.3
OBS:19.0.2
OBS:19.0.1
OBS:19.0.0
OBS:18.0.2
OBS:18.0.1
OBS:18.0.0
OBS:17.0.2
OBS:17.0.1
OBS:17.0.0
OBS:0.16.6
OBS:0.16.5
OBS:0.16.4
OBS:0.16.3
OBS:0.16.2
OBS:0.16.1
OBS:0.16.0
OBS:0.15.4
OBS:0.15.3
OBS:0.15.2
OBS:0.15.1
OBS:0.15.0
OBS:0.14.2
OBS:0.14.1
OBS:0.14.0
OBS:0.13.4
OBS:0.13.3
OBS:0.13.2
OBS:0.13.1
OBS:0.13.1-rc1
OBS:0.13.0
OBS:0.12.4
OBS:0.12.3
OBS:0.12.2
OBS:0.12.1
OBS:0.12.0
OBS:0.11.4
OBS:0.11.3
OBS:0.11.2
OBS:0.11.1
OBS:0.11.0
OBS:0.10.1
OBS:0.10.0
OBS:0.9.1
OBS:0.9.0
OBS:0.8.3
OBS:0.8.2
OBS:0.8.1
OBS:0.8.0
OBS:0.7.3
OBS:0.7.2
OBS:0.7.1
OBS:0.6.4
OBS:0.6.3
OBS:0.6.2
OBS:0.6.1
OBS:0.6.0
OBS:0.5.1
OBS:0.5.0
OBS:0.4.2
OBS:0.4.1
OBS:0.4.0
OBS:0.3.1
OBS:0.2.4

3 commits
3bb573a911 ... bef2d51537

Author SHA1 Message Date
David Rosca bef2d51537
Merge 9a8ff0847d into 9d67bf2662 2024-06-27 13:48:28 -03:00
Ryan Foster 9d67bf2662 Revert "plugins/win-dshow: Add CUDA decoder" 
This reverts commit ce4c99be4e.

This was causing infinitely looping log errors in systems with no
CUDA-capable hardware when hardware decoding was enabled on video
capture devices with custom config enabled.
 2024-06-26 18:43:09 -04:00
David Rosca 9a8ff0847d
obs-ffmpeg: Add ROI support for VAAPI 2024-04-21 09:15:44 +02:00
2 changed files with 49 additions and 8 deletions
Show stats Expand all files Collapse all files

51
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
View file

@ -669,6 +669,42 @@ static inline void copy_data(AVFrame *pic, const struct encoder_frame *frame,
}
}
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)
@ -676,6 +712,9 @@ static bool vaapi_encode_internal(struct vaapi_encoder *enc, AVFrame *frame,
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);
@ -1311,7 +1350,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 = {
@ -1327,7 +1366,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 = {
@ -1343,7 +1382,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 = {
@ -1359,7 +1398,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
@ -1376,7 +1415,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 = {
@ -1392,6 +1431,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

6
plugins/win-dshow/ffmpeg-decode.c
View file

@ -23,8 +23,10 @@
#endif
enum AVHWDeviceType hw_priority[] = {
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_QSV, AV_HWDEVICE_TYPE_NONE,
AV_HWDEVICE_TYPE_D3D11VA,
AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_QSV,
AV_HWDEVICE_TYPE_NONE,
};
static bool has_hw_type(const AVCodec *c, enum AVHWDeviceType type)