Commit 762ce5d1 authored by Alexandre Lision's avatar Alexandre Lision Committed by gerrit2

video: use ffmpeg on OSX

Switch to ffmpeg for video processing on OSX.
FFmpeg provides hardware acceleration for video decoding

Change-Id: Ic1136ac7c4f4917c1250a4ea732775c47a6e6c39
parent bd90c365
This diff is collapsed.
This diff is collapsed.
......@@ -86,6 +86,8 @@ FFMPEGCONF += \
--enable-encoder=tiff \
--enable-decoder=tiff
DEPS_ffmpeg = iconv zlib x264 vpx opus speex $(DEPS_vpx)
ifdef HAVE_WIN32
FFMPEGCONF += \
--enable-indev=dshow \
......@@ -192,6 +194,8 @@ ifdef HAVE_IOS
endif
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/ffmpeg/clock_gettime.patch
$(APPLY) $(SRC)/ffmpeg/0004-add-avfcapture-device.patch
$(APPLY) $(SRC)/ffmpeg/0005-add-avfgrab-device.patch
endif
$(MOVE)
......
......@@ -96,8 +96,8 @@ VideoDeviceImpl::getDeviceParams() const
{
DeviceParams params;
params.name = [[avDevice_ localizedName] UTF8String];
params.input = "[" + device + "]";
params.format = "avfoundation";
params.input = device;
params.format = "avfcapture";
params.width = current_size_.first;
params.height = current_size_.second;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment