Skip to content

Commit

Permalink
Add VideoToolbox based decoder
Browse files Browse the repository at this point in the history
Supports H.264, mp4v, H.263 and DV depending on Darwin flavor and version
  • Loading branch information
fkuehne authored and jbkempf committed Jun 26, 2015
1 parent a3ce892 commit 1f5567b
Show file tree
Hide file tree
Showing 4 changed files with 1,101 additions and 0 deletions.
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ Decoder:
* Support hardware decoding using Direct3D11, including GPU-zerocopy mode
* DxVA2 GPU-zerocopy for hardware decoding and displaying on Windows
* 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:
* Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS)
Expand Down
6 changes: 6 additions & 0 deletions modules/codec/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,12 @@ libvorbis_plugin_la_LIBADD = $(VORBIS_LIBS)
EXTRA_LTLIBRARIES += libvorbis_plugin.la
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 ###

Expand Down
Loading

0 comments on commit 1f5567b

Please sign in to comment.