summaryrefslogtreecommitdiff
path: root/examples.mk
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2010-10-19 17:20:17 -0400
committerJohn Koleszar <jkoleszar@google.com>2010-10-25 22:01:40 -0400
commitad252daf65bcc989f5265b7bef7b04430cafcef4 (patch)
treee57b67f0ac2f82b089a72b85bda88d8b2bea36db /examples.mk
parent28d191ada449130276fc10030e8ff68460a8c812 (diff)
downloadlibvpx-ad252daf65bcc989f5265b7bef7b04430cafcef4.tar
libvpx-ad252daf65bcc989f5265b7bef7b04430cafcef4.tar.gz
libvpx-ad252daf65bcc989f5265b7bef7b04430cafcef4.tar.bz2
libvpx-ad252daf65bcc989f5265b7bef7b04430cafcef4.zip
ivfdec: webm reader support
This patch enables ivfdec to decode WebM files. WebM demuxing is provided by the Matthew Gregan's Nestegg library. This patch also makes minor changes to the timebase->framerate handling when doing Y4M output. For WebM files, the framerate is guessed by looking at the first second of video. For IVF files, the timebase=1/(2*fps) hack is still in place, but is only used if the timebase denominator is less than 1000. This is in anticipation of change I8d25b5b, which introduces the distinction between framerate and timebase to ivfenc. In the case of high resolution timebases, like 100ns, we would have to guess the framerate like we do for WebM, but since WebM support in ivfenc will deprecate IVF output, we just assume 30fps rather than writing the lookahead code. Change-Id: I1dd8600f13bf6071533d2816f005da9ede4f60a2
Diffstat (limited to 'examples.mk')
-rw-r--r--examples.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/examples.mk b/examples.mk
index 00ffc7037..56da642ae 100644
--- a/examples.mk
+++ b/examples.mk
@@ -17,6 +17,13 @@ ivfdec.SRCS += md5_utils.c md5_utils.h
ivfdec.SRCS += vpx_ports/vpx_timer.h
ivfdec.SRCS += vpx/vpx_integer.h
ivfdec.SRCS += args.c args.h vpx_ports/config.h
+ivfdec.SRCS += nestegg/halloc/halloc.h
+ivfdec.SRCS += nestegg/halloc/src/align.h
+ivfdec.SRCS += nestegg/halloc/src/halloc.c
+ivfdec.SRCS += nestegg/halloc/src/hlist.h
+ivfdec.SRCS += nestegg/halloc/src/macros.h
+ivfdec.SRCS += nestegg/include/nestegg/nestegg.h
+ivfdec.SRCS += nestegg/src/nestegg.c
ivfdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950
ivfdec.DESCRIPTION = Full featured decoder
UTILS-$(CONFIG_ENCODERS) += ivfenc.c