Skip to content

Commit e151aab

Browse files
committed
Add support for videotoolbox
1 parent 7a6052f commit e151aab

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

src/modules/avformat/producer_avformat.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,21 +2774,22 @@ static int producer_get_image(mlt_frame frame,
27742774
"scale_vaapi",
27752775
consumer_scale);
27762776
self->hwaccel.filters_initialized = 1;
2777+
} else if (self->hwaccel.pix_fmt == AV_PIX_FMT_VIDEOTOOLBOX
2778+
&& !self->hwaccel.filters_initialized
2779+
&& !self->vfilter_graph) {
2780+
setup_hwaccel_filters(self,
2781+
producer,
2782+
"scale_vt",
2783+
consumer_scale);
2784+
self->hwaccel.filters_initialized = 1;
27772785
}
27782786
}
27792787

27802788
// Apply hardware scale filter if initialized successfully
27812789
// Only apply if frame is still in hardware format
2782-
#if HAVE_FFMPEG_VULKAN
2783-
if (self->hwaccel.pix_fmt == AV_PIX_FMT_VULKAN
2784-
&& self->video_frame->format == AV_PIX_FMT_VULKAN
2785-
&& self->hwaccel.filters_initialized && self->vfilter_graph
2786-
&& self->vfilter_in && self->vfilter_out) {
2787-
apply_hwaccel_filters(self, producer);
2788-
}
2789-
#endif
2790-
if (self->hwaccel.pix_fmt == AV_PIX_FMT_VAAPI
2791-
&& self->video_frame->format == AV_PIX_FMT_VAAPI
2790+
if ((self->video_frame->format == AV_PIX_FMT_VAAPI
2791+
|| self->video_frame->format == AV_PIX_FMT_VIDEOTOOLBOX
2792+
|| self->video_frame->format == AV_PIX_FMT_VULKAN)
27922793
&& self->hwaccel.filters_initialized && self->vfilter_graph
27932794
&& self->vfilter_in && self->vfilter_out) {
27942795
apply_hwaccel_filters(self, producer);

0 commit comments

Comments
 (0)