Commit 4f979418 authored by Alexandre Lision's avatar Alexandre Lision Committed by Luca Barbato

avfoundation: Simple capture

Originally based on the capture written by
Thilo Borgmann <thilo.borgmann@mail.de>.
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 9f57f134
...@@ -48,6 +48,7 @@ version <next>: ...@@ -48,6 +48,7 @@ version <next>:
- libkvazaar HEVC encoder - libkvazaar HEVC encoder
- innoHeim/Rsupport Screen Capture Codec decoder - innoHeim/Rsupport Screen Capture Codec decoder
- support encoding 16-bit RLE SGI images - support encoding 16-bit RLE SGI images
- support Apple AVFoundation video capture
version 11: version 11:
......
...@@ -1453,6 +1453,7 @@ HAVE_LIST_PUB=" ...@@ -1453,6 +1453,7 @@ HAVE_LIST_PUB="
" "
HEADERS_LIST=" HEADERS_LIST="
AVFoundation_AVFoundation_h
alsa_asoundlib_h alsa_asoundlib_h
altivec_h altivec_h
arpa_inet_h arpa_inet_h
...@@ -2264,6 +2265,7 @@ xwma_demuxer_select="riffdec" ...@@ -2264,6 +2265,7 @@ xwma_demuxer_select="riffdec"
# indevs / outdevs # indevs / outdevs
alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
alsa_outdev_deps="alsa_asoundlib_h" alsa_outdev_deps="alsa_asoundlib_h"
avfoundation_indev_deps="AVFoundation_AVFoundation_h"
bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
dv1394_indev_deps="dv1394" dv1394_indev_deps="dv1394"
dv1394_indev_select="dv_demuxer" dv1394_indev_select="dv_demuxer"
...@@ -4560,6 +4562,11 @@ check_header linux/fb.h ...@@ -4560,6 +4562,11 @@ check_header linux/fb.h
check_header linux/videodev2.h check_header linux/videodev2.h
check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
check_header AVFoundation/AVFoundation.h &&
check_objcflags -fobjc-arc &&
add_extralibs -framework Foundation -framework AVFoundation -framework CoreMedia || \
disable AVFoundation_AVFoundation_h
check_header sys/videoio.h check_header sys/videoio.h
check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
......
...@@ -9,6 +9,7 @@ OBJS = alldevices.o \ ...@@ -9,6 +9,7 @@ OBJS = alldevices.o \
# input/output devices # input/output devices
OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o
OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o
OBJS-$(CONFIG_AVFOUNDATION_INDEV) += avfoundation_dec.o
OBJS-$(CONFIG_BKTR_INDEV) += bktr.o OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o
OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o
......
...@@ -48,6 +48,7 @@ void avdevice_register_all(void) ...@@ -48,6 +48,7 @@ void avdevice_register_all(void)
/* devices */ /* devices */
REGISTER_INOUTDEV(ALSA, alsa); REGISTER_INOUTDEV(ALSA, alsa);
REGISTER_INDEV (AVFOUNDATION, avfoundation);
REGISTER_INDEV (BKTR, bktr); REGISTER_INDEV (BKTR, bktr);
REGISTER_INDEV (DV1394, dv1394); REGISTER_INDEV (DV1394, dv1394);
REGISTER_INDEV (FBDEV, fbdev); REGISTER_INDEV (FBDEV, fbdev);
......
This diff is collapsed.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVDEVICE_VERSION_MAJOR 56 #define LIBAVDEVICE_VERSION_MAJOR 56
#define LIBAVDEVICE_VERSION_MINOR 0 #define LIBAVDEVICE_VERSION_MINOR 1
#define LIBAVDEVICE_VERSION_MICRO 0 #define LIBAVDEVICE_VERSION_MICRO 0
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
......
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