Commit 1f5567b3 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

Add VideoToolbox based decoder

Supports H.264, mp4v, H.263 and DV depending on Darwin flavor and version
parent a3ce8926
...@@ -46,6 +46,9 @@ Decoder: ...@@ -46,6 +46,9 @@ Decoder:
* Support hardware decoding using Direct3D11, including GPU-zerocopy mode * Support hardware decoding using Direct3D11, including GPU-zerocopy mode
* DxVA2 GPU-zerocopy for hardware decoding and displaying on Windows * DxVA2 GPU-zerocopy for hardware decoding and displaying on Windows
* Support 9-bit and 10-bit GBR planar formats * Support 9-bit and 10-bit GBR planar formats
* New hardware accelerated decoder for OS X and and iOS based on Video Toolbox
supporting H.263, H.264/MPEG-4 AVC, MPEG-4 Part 2, and DV depending on device
and OS version
Demuxers: Demuxers:
* Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS) * Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS)
......
...@@ -285,6 +285,12 @@ libvorbis_plugin_la_LIBADD = $(VORBIS_LIBS) ...@@ -285,6 +285,12 @@ libvorbis_plugin_la_LIBADD = $(VORBIS_LIBS)
EXTRA_LTLIBRARIES += libvorbis_plugin.la EXTRA_LTLIBRARIES += libvorbis_plugin.la
codec_LTLIBRARIES += $(LTLIBvorbis) codec_LTLIBRARIES += $(LTLIBvorbis)
libvideotoolbox_plugin_la_SOURCES = video_chroma/copy.c video_chroma/copy.h packetizer/h264_nal.c packetizer/h264_nal.h codec/videotoolbox.m
libvideotoolbox_plugin_la_CFLAGS = $(AM_CFLAGS) -fobjc-arc
libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
if HAVE_DARWIN
codec_LTLIBRARIES += libvideotoolbox_plugin.la
endif
### FFmpeg/libav ### ### FFmpeg/libav ###
......
This diff is collapsed.
...@@ -418,6 +418,7 @@ modules/codec/theora.c ...@@ -418,6 +418,7 @@ modules/codec/theora.c
modules/codec/substtml.c modules/codec/substtml.c
modules/codec/twolame.c modules/codec/twolame.c
modules/codec/uleaddvaudio.c modules/codec/uleaddvaudio.c
modules/codec/videotoolbox.m
modules/codec/vorbis.c modules/codec/vorbis.c
modules/codec/vpx.c modules/codec/vpx.c
modules/codec/wmafixed/wma.c modules/codec/wmafixed/wma.c
......
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